spin-kickstarts-commits
October 2008
spin-kickstarts-commits@lists.fedorahosted.org
- 9 participants
- 44 discussions
fedora-live-base.ks
by Jeremy Katz
fedora-live-base.ks | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
New commits:
commit b1aa0f441e561581c3c1379e932c2ff86cc5009f
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Thu Oct 2 22:17:09 2008 -0400
Support using the internal NAND as the persistent /home for the OLPC
The OLPC's internal NAND is a really good idea to use for /home rather than
taking up the very hard to find RAM. The NAND is default set up with a
/home on mtd0, so also do some magic so that we create our homedir under that
/home.
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 58daf9c..df2e6ec 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -131,7 +131,10 @@ mountPersistentHome() {
fi
# if we're given a file rather than a blockdev, loopback it
- if [ ! -b "\$homedev" ]; then
+ if [ "\${homedev##mtd}" != "\${homedev}" ]; then
+ # mtd devs don't have a block device but get magic-mounted with -t jffs2
+ mountopts="-t jffs2"
+ elif [ ! -b "\$homedev" ]; then
loopdev=\`losetup -f\`
if [ "\${homedev##/mnt/live}" != "\${homedev}" ]; then
action "Remounting live store r/w" mount -o remount,rw /mnt/live
@@ -141,7 +144,7 @@ mountPersistentHome() {
fi
# if it's encrypted, we need to unlock it
- if [ "\$(/lib/udev/vol_id -t \$homedev)" = "crypto_LUKS" ]; then
+ if [ "\$(/lib/udev/vol_id -t \$homedev 2>/dev/null)" = "crypto_LUKS" ]; then
echo
echo "Setting up encrypted /home device"
plymouth ask-for-password --command="cryptsetup luksOpen \$homedev EncHome"
@@ -149,7 +152,10 @@ mountPersistentHome() {
fi
# and finally do the mount
- mount \$homedev /home
+ mount \$mountopts \$homedev /home
+ # if we have /home under what's passed for persistent home, then
+ # we should make that the real /home. useful for mtd device on olpc
+ if [ -d /home/home ]; then mount --bind /home/home /home ; fi
[ -x /sbin/restorecon ] && /sbin/restorecon /home
if [ -d /home/liveuser ]; then USERADDARGS="-M" ; fi
}
15 years, 9 months
- 1
- 0
fedora-livecd-desktop-pt_PT.ks fedora-livedvd-developer-pt_PT.ks fedora-livedvd-games-pt_PT.ks templates/language-pt_PT.ks
by Pedro Silva
fedora-livecd-desktop-pt_PT.ks | 8 --------
fedora-livedvd-developer-pt_PT.ks | 8 --------
fedora-livedvd-games-pt_PT.ks | 8 --------
templates/language-pt_PT.ks | 2 +-
4 files changed, 1 insertion(+), 25 deletions(-)
New commits:
commit e61da567cd4a1edcf2d484392da34c5eeb048dc1
Author: Pedro Silva <pedro(a)localhost.localdomain>
Date: Fri Oct 3 02:35:32 2008 +0100
Remove xorg keyboard patch in gnome based pt_PT livecd/dvd
Fix language-pt_PT.ks template
diff --git a/fedora-livecd-desktop-pt_PT.ks b/fedora-livecd-desktop-pt_PT.ks
index 78fe1d8..daf1c43 100644
--- a/fedora-livecd-desktop-pt_PT.ks
+++ b/fedora-livecd-desktop-pt_PT.ks
@@ -14,12 +14,4 @@ timezone Europe/Lisbon
%end
%post
-# system-config-keyboard doesn't really work (missing xorg.conf etc)
-cat >>/etc/X11/xorg.conf << EOF
-Section "InputDevice"
- Identifier "Keyboard0"
- Driver "kbd"
- Option "XkbLayout" "pt"
-EndSection
-EOF
%end
diff --git a/fedora-livedvd-developer-pt_PT.ks b/fedora-livedvd-developer-pt_PT.ks
index b217800..0a96c12 100644
--- a/fedora-livedvd-developer-pt_PT.ks
+++ b/fedora-livedvd-developer-pt_PT.ks
@@ -14,12 +14,4 @@ timezone Europe/Lisbon
%end
%post
-# system-config-keyboard doesn't really work (missing xorg.conf etc)
-cat >>/etc/X11/xorg.conf << EOF
-Section "InputDevice"
- Identifier "Keyboard0"
- Driver "kbd"
- Option "XkbLayout" "pt"
-EndSection
-EOF
%end
diff --git a/fedora-livedvd-games-pt_PT.ks b/fedora-livedvd-games-pt_PT.ks
index 7a385a5..8bafa06 100644
--- a/fedora-livedvd-games-pt_PT.ks
+++ b/fedora-livedvd-games-pt_PT.ks
@@ -14,12 +14,4 @@ timezone Europe/Lisbon
%end
%post
-# system-config-keyboard doesn't really work (missing xorg.conf etc)
-cat >>/etc/X11/xorg.conf << EOF
-Section "InputDevice"
- Identifier "Keyboard0"
- Driver "kbd"
- Option "XkbLayout" "pt"
-EndSection
-EOF
%end
diff --git a/templates/language-pt_PT.ks b/templates/language-pt_PT.ks
index 8befa2f..c22dea5 100644
--- a/templates/language-pt_PT.ks
+++ b/templates/language-pt_PT.ks
@@ -5,6 +5,6 @@ cat >>/etc/X11/xorg.conf << EOF
Section "InputDevice"
Identifier "Keyboard0"
Driver "kbd"
- Option "XkbLayout" "pt-latin1"
+ Option "XkbLayout" "pt"
EndSection
EOF
15 years, 9 months
- 1
- 0
2 commits - fedora-livecd-education-math.ks fedora-livecd-electronic-lab.ks fedora-livecd-electronic-lab-pt_PT.ks fedora-livecd-kde-de_CH.ks fedora-livecd-kde-de_DE.ks fedora-livecd-kde.ks fedora-livecd-kde-pt_PT.ks fedora-livecd-xfce.ks
by Jeremy Katz
fedora-livecd-education-math.ks | 8 ++++----
fedora-livecd-electronic-lab-pt_PT.ks | 2 +-
fedora-livecd-electronic-lab.ks | 6 +++---
fedora-livecd-kde-de_CH.ks | 2 +-
fedora-livecd-kde-de_DE.ks | 2 +-
fedora-livecd-kde-pt_PT.ks | 2 +-
fedora-livecd-kde.ks | 4 ++--
fedora-livecd-xfce.ks | 2 +-
8 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 1e4bef319b6fc1ddcb294bb8ffd0f7896a4482ba
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Thu Oct 2 11:08:23 2008 -0400
Fix up autologin on other kde images for fedora->liveuser change
diff --git a/fedora-livecd-education-math.ks b/fedora-livecd-education-math.ks
index 5795422..b2a7894 100644
--- a/fedora-livecd-education-math.ks
+++ b/fedora-livecd-education-math.ks
@@ -126,11 +126,11 @@ chown liveuser:liveuser /home/liveuser/.xsession
# set up autologin for user fedora
sed -i 's/#AutoLoginEnable=true/AutoLoginEnable=true/' /etc/kde/kdm/kdmrc
-sed -i 's/#AutoLoginUser=fred/AutoLoginUser=fedora/' /etc/kde/kdm/kdmrc
+sed -i 's/#AutoLoginUser=fred/AutoLoginUser=liveuser/' /etc/kde/kdm/kdmrc
# set up user fedora as default user and preselected user
sed -i 's/#PreselectUser=Default/PreselectUser=Default/' /etc/kde/kdm/kdmrc
-sed -i 's/#DefaultUser=johndoe/DefaultUser=fedora/' /etc/kde/kdm/kdmrc
+sed -i 's/#DefaultUser=johndoe/DefaultUser=liveuser/' /etc/kde/kdm/kdmrc
# add apps to favorites menu
mkdir -p /home/liveuser/.kde/share/config/
diff --git a/fedora-livecd-electronic-lab.ks b/fedora-livecd-electronic-lab.ks
index 596f254..5b15e45 100644
--- a/fedora-livecd-electronic-lab.ks
+++ b/fedora-livecd-electronic-lab.ks
@@ -194,11 +194,11 @@ chown liveuser:liveuser /home/liveuser/.xsession
# set up autologin for user fedora
sed -i 's/#AutoLoginEnable=true/AutoLoginEnable=true/' /etc/kde/kdm/kdmrc
-sed -i 's/#AutoLoginUser=fred/AutoLoginUser=fedora/' /etc/kde/kdm/kdmrc
+sed -i 's/#AutoLoginUser=fred/AutoLoginUser=liveuser/' /etc/kde/kdm/kdmrc
# set up user fedora as default user and preselected user
sed -i 's/#PreselectUser=Default/PreselectUser=Default/' /etc/kde/kdm/kdmrc
-sed -i 's/#DefaultUser=johndoe/DefaultUser=fedora/' /etc/kde/kdm/kdmrc
+sed -i 's/#DefaultUser=johndoe/DefaultUser=liveuser/' /etc/kde/kdm/kdmrc
# disable screensaver
sed -i 's/Enabled=true/Enabled=false/' /usr/share/kde-settings/kde-profile/default/share/config/kdesktoprc
commit 7ccf72a59f23f7becf0d7d0e5a97852cb46cd588
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Thu Oct 2 11:07:33 2008 -0400
Fix file ownership for the username change
diff --git a/fedora-livecd-education-math.ks b/fedora-livecd-education-math.ks
index 0684791..5795422 100644
--- a/fedora-livecd-education-math.ks
+++ b/fedora-livecd-education-math.ks
@@ -122,7 +122,7 @@ fi
# make fedora user use KDE
echo "startkde" > /home/liveuser/.xsession
chmod a+x /home/liveuser/.xsession
-chown fedora:fedora /home/liveuser/.xsession
+chown liveuser:liveuser /home/liveuser/.xsession
# set up autologin for user fedora
sed -i 's/#AutoLoginEnable=true/AutoLoginEnable=true/' /etc/kde/kdm/kdmrc
@@ -138,7 +138,7 @@ cat > /home/liveuser/.kde/share/config/kickoffrc << MENU_EOF
[Favorites]
FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/liveinst.desktop
MENU_EOF
-chown -R fedora:fedora /home/liveuser/.kde/
+chown -R liveuser:liveuser /home/liveuser/.kde/
# show liveinst.desktop on and in menu
sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
diff --git a/fedora-livecd-electronic-lab-pt_PT.ks b/fedora-livecd-electronic-lab-pt_PT.ks
index 93f395a..f3107ef 100644
--- a/fedora-livecd-electronic-lab-pt_PT.ks
+++ b/fedora-livecd-electronic-lab-pt_PT.ks
@@ -20,5 +20,5 @@ timezone Europe/Lisbon
mkdir -p /home/liveuser/.kde/env
echo "system-config-keyboard --noui de-latin1-nodeadkeys" > /home/liveuser/.kde/env/keyboard.sh
chmod +x /home/liveuser/.kde/env/keyboard.sh
-chown -R fedora:fedora /home/liveuser/.kde/env/
+chown -R liveuser:liveuser /home/liveuser/.kde/env/
%end
diff --git a/fedora-livecd-electronic-lab.ks b/fedora-livecd-electronic-lab.ks
index 69f9ee0..596f254 100644
--- a/fedora-livecd-electronic-lab.ks
+++ b/fedora-livecd-electronic-lab.ks
@@ -190,7 +190,7 @@ fi
# make fedora user use KDE
echo "startkde" > /home/liveuser/.xsession
chmod a+x /home/liveuser/.xsession
-chown fedora:fedora /home/liveuser/.xsession
+chown liveuser:liveuser /home/liveuser/.xsession
# set up autologin for user fedora
sed -i 's/#AutoLoginEnable=true/AutoLoginEnable=true/' /etc/kde/kdm/kdmrc
diff --git a/fedora-livecd-kde-de_CH.ks b/fedora-livecd-kde-de_CH.ks
index f508ad1..10f30b0 100644
--- a/fedora-livecd-kde-de_CH.ks
+++ b/fedora-livecd-kde-de_CH.ks
@@ -21,6 +21,6 @@ timezone Europe/Zurich
mkdir -p /home/liveuser/.kde/env
echo "system-config-keyboard --noui sg-latin1-nodeadkeys" > /home/liveuser/.kde/env/keyboard.sh
chmod +x /home/liveuser/.kde/env/keyboard.sh
-chown -R fedora:fedora /home/liveuser/.kde/env/
+chown -R liveuser:liveuser /home/liveuser/.kde/env/
%end
diff --git a/fedora-livecd-kde-de_DE.ks b/fedora-livecd-kde-de_DE.ks
index ecc5654..e14e217 100644
--- a/fedora-livecd-kde-de_DE.ks
+++ b/fedora-livecd-kde-de_DE.ks
@@ -21,6 +21,6 @@ timezone Europe/Berlin
mkdir -p /home/liveuser/.kde/env
echo "system-config-keyboard --noui de-latin1-nodeadkeys" > /home/liveuser/.kde/env/keyboard.sh
chmod +x /home/liveuser/.kde/env/keyboard.sh
-chown -R fedora:fedora /home/liveuser/.kde/env/
+chown -R liveuser:liveuser /home/liveuser/.kde/env/
%end
\ No newline at end of file
diff --git a/fedora-livecd-kde-pt_PT.ks b/fedora-livecd-kde-pt_PT.ks
index 134bea2..5d7d527 100644
--- a/fedora-livecd-kde-pt_PT.ks
+++ b/fedora-livecd-kde-pt_PT.ks
@@ -21,5 +21,5 @@ timezone Europe/Lisbon
mkdir -p /home/liveuser/.kde/env
echo "system-config-keyboard --noui de-latin1-nodeadkeys" > /home/liveuser/.kde/env/keyboard.sh
chmod +x /home/liveuser/.kde/env/keyboard.sh
-chown -R fedora:fedora /home/liveuser/.kde/env/
+chown -R liveuser:liveuser /home/liveuser/.kde/env/
%end
diff --git a/fedora-livecd-kde.ks b/fedora-livecd-kde.ks
index 878a054..df35004 100644
--- a/fedora-livecd-kde.ks
+++ b/fedora-livecd-kde.ks
@@ -96,7 +96,7 @@ fi
# make fedora user use KDE
echo "startkde" > /home/liveuser/.xsession
chmod a+x /home/liveuser/.xsession
-chown fedora:fedora /home/liveuser/.xsession
+chown liveuser:liveuser /home/liveuser/.xsession
# set up autologin for user fedora
sed -i 's/#AutoLoginEnable=true/AutoLoginEnable=true/' /etc/kde/kdm/kdmrc
@@ -112,7 +112,7 @@ cat > /home/liveuser/.kde/share/config/kickoffrc << MENU_EOF
[Favorites]
FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/kde4/systemsettings.desktop,/usr/share/applications/liveinst.desktop
MENU_EOF
-chown -R fedora:fedora /home/liveuser/.kde/
+chown -R liveuser:liveuser /home/liveuser/.kde/
# show liveinst.desktop on and in menu
sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
diff --git a/fedora-livecd-xfce.ks b/fedora-livecd-xfce.ks
index 1cb7d61..693eb21 100644
--- a/fedora-livecd-xfce.ks
+++ b/fedora-livecd-xfce.ks
@@ -158,7 +158,7 @@ Language=en
EOF
cat >> /etc/rc.d/init.d/livesys << EOF
-chown -R fedora:fedora /home/liveuser
+chown -R liveuser:liveuser /home/liveuser
# disable screensaver locking
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-screensaver/lock_enabled false >/dev/null
15 years, 9 months
- 1
- 0
fedora-live-base.ks fedora-livecd-desktop.ks fedora-livecd-education-math.ks fedora-livecd-electronic-lab.ks fedora-livecd-electronic-lab-pt_PT.ks fedora-livecd-kde-de_CH.ks fedora-livecd-kde-de_DE.ks fedora-livecd-kde.ks fedora-livecd-kde-pt_PT.ks fedora-livecd-xfce.ks fedora-livedvd-developer.ks fedora-livedvd-electronic-lab.ks
by Jeremy Katz
fedora-live-base.ks | 22 +++++++++++-----------
fedora-livecd-desktop.ks | 4 ++--
fedora-livecd-education-math.ks | 14 +++++++-------
fedora-livecd-electronic-lab-pt_PT.ks | 8 ++++----
fedora-livecd-electronic-lab.ks | 8 ++++----
fedora-livecd-kde-de_CH.ks | 8 ++++----
fedora-livecd-kde-de_DE.ks | 8 ++++----
fedora-livecd-kde-pt_PT.ks | 8 ++++----
fedora-livecd-kde.ks | 18 +++++++++---------
fedora-livecd-xfce.ks | 10 +++++-----
fedora-livedvd-developer.ks | 4 ++--
fedora-livedvd-electronic-lab.ks | 6 +++---
12 files changed, 59 insertions(+), 59 deletions(-)
New commits:
commit ca2f8913a2901b7c0a59046aca0afbb9f1c24e49
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Thu Oct 2 11:05:16 2008 -0400
Switch out references to fedora in initscript and username to be generic
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 8ba892a..58daf9c 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -89,7 +89,7 @@ isomd5sum
%post
# FIXME: it'd be better to get this installed from a package
-cat > /etc/rc.d/init.d/fedora-live << EOF
+cat > /etc/rc.d/init.d/livesys << EOF
#!/bin/bash
#
# live: Init script for live image
@@ -151,7 +151,7 @@ mountPersistentHome() {
# and finally do the mount
mount \$homedev /home
[ -x /sbin/restorecon ] && /sbin/restorecon /home
- if [ -d /home/fedora ]; then USERADDARGS="-M" ; fi
+ if [ -d /home/liveuser ]; then USERADDARGS="-M" ; fi
}
findPersistentHome() {
@@ -175,8 +175,8 @@ if ! strstr "\`cat /proc/cmdline\`" nopersistenthome && [ -n "\$homedev" ] ; the
fi
# add fedora user with no passwd
-action "Adding fedora user" useradd \$USERADDARGS -c "Fedora Live" fedora
-passwd -d fedora > /dev/null
+action "Adding live user" useradd \$USERADDARGS -c "Live System User" liveuser
+passwd -d liveuser > /dev/null
# turn off firstboot for livecd boots
chkconfig --level 345 firstboot off 2>/dev/null
@@ -230,7 +230,7 @@ fi
EOF
# bah, hal starts way too late
-cat > /etc/rc.d/init.d/fedora-late-live << EOF
+cat > /etc/rc.d/init.d/livesys-late << EOF
#!/bin/bash
#
# live: Late init script for live image
@@ -283,13 +283,13 @@ EOF
touch /etc/resolv.conf
/sbin/restorecon /etc/resolv.conf
-chmod 755 /etc/rc.d/init.d/fedora-live
-/sbin/restorecon /etc/rc.d/init.d/fedora-live
-/sbin/chkconfig --add fedora-live
+chmod 755 /etc/rc.d/init.d/livesys
+/sbin/restorecon /etc/rc.d/init.d/livesys
+/sbin/chkconfig --add livesys
-chmod 755 /etc/rc.d/init.d/fedora-late-live
-/sbin/restorecon /etc/rc.d/init.d/fedora-late-live
-/sbin/chkconfig --add fedora-late-live
+chmod 755 /etc/rc.d/init.d/livesys-late
+/sbin/restorecon /etc/rc.d/init.d/livesys-late
+/sbin/chkconfig --add livesys-late
# work around for poor key import UI in PackageKit
rm -f /var/lib/rpm/__db*
diff --git a/fedora-livecd-desktop.ks b/fedora-livecd-desktop.ks
index bfda592..4de25bd 100644
--- a/fedora-livecd-desktop.ks
+++ b/fedora-livecd-desktop.ks
@@ -63,14 +63,14 @@ scim-pinyin
%end
%post
-cat >> /etc/rc.d/init.d/fedora-live << EOF
+cat >> /etc/rc.d/init.d/livesys << EOF
# disable screensaver locking
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-screensaver/lock_enabled false >/dev/null
# set up timed auto-login for after 60 seconds
cat >> /etc/gdm/custom.conf << FOE
[daemon]
TimedLoginEnable=true
-TimedLogin=fedora
+TimedLogin=liveuser
TimedLoginDelay=60
FOE
diff --git a/fedora-livecd-education-math.ks b/fedora-livecd-education-math.ks
index fbb4156..0684791 100644
--- a/fedora-livecd-education-math.ks
+++ b/fedora-livecd-education-math.ks
@@ -111,7 +111,7 @@ DISPLAYMANAGER="KDM"
EOF
# add initscript
-cat >> /etc/rc.d/init.d/fedora-live << EOF
+cat >> /etc/rc.d/init.d/livesys << EOF
if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
# use image also for kdm
@@ -120,9 +120,9 @@ if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
fi
# make fedora user use KDE
-echo "startkde" > /home/fedora/.xsession
-chmod a+x /home/fedora/.xsession
-chown fedora:fedora /home/fedora/.xsession
+echo "startkde" > /home/liveuser/.xsession
+chmod a+x /home/liveuser/.xsession
+chown fedora:fedora /home/liveuser/.xsession
# set up autologin for user fedora
sed -i 's/#AutoLoginEnable=true/AutoLoginEnable=true/' /etc/kde/kdm/kdmrc
@@ -133,12 +133,12 @@ sed -i 's/#PreselectUser=Default/PreselectUser=Default/' /etc/kde/kdm/kdmrc
sed -i 's/#DefaultUser=johndoe/DefaultUser=fedora/' /etc/kde/kdm/kdmrc
# add apps to favorites menu
-mkdir -p /home/fedora/.kde/share/config/
-cat > /home/fedora/.kde/share/config/kickoffrc << MENU_EOF
+mkdir -p /home/liveuser/.kde/share/config/
+cat > /home/liveuser/.kde/share/config/kickoffrc << MENU_EOF
[Favorites]
FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/liveinst.desktop
MENU_EOF
-chown -R fedora:fedora /home/fedora/.kde/
+chown -R fedora:fedora /home/liveuser/.kde/
# show liveinst.desktop on and in menu
sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
diff --git a/fedora-livecd-electronic-lab-pt_PT.ks b/fedora-livecd-electronic-lab-pt_PT.ks
index 2c98ce9..93f395a 100644
--- a/fedora-livecd-electronic-lab-pt_PT.ks
+++ b/fedora-livecd-electronic-lab-pt_PT.ks
@@ -17,8 +17,8 @@ timezone Europe/Lisbon
# set up localized keyboard since it is not used in /etc/X11/xorg.conf anymore and
# KDE don't use /etc/sysconfig/keyboard.
# Replace "de-latin1-nodeadkeys" with the keyboard layout you have used above
-mkdir -p /home/fedora/.kde/env
-echo "system-config-keyboard --noui de-latin1-nodeadkeys" > /home/fedora/.kde/env/keyboard.sh
-chmod +x /home/fedora/.kde/env/keyboard.sh
-chown -R fedora:fedora /home/fedora/.kde/env/
+mkdir -p /home/liveuser/.kde/env
+echo "system-config-keyboard --noui de-latin1-nodeadkeys" > /home/liveuser/.kde/env/keyboard.sh
+chmod +x /home/liveuser/.kde/env/keyboard.sh
+chown -R fedora:fedora /home/liveuser/.kde/env/
%end
diff --git a/fedora-livecd-electronic-lab.ks b/fedora-livecd-electronic-lab.ks
index d56e8c8..69f9ee0 100644
--- a/fedora-livecd-electronic-lab.ks
+++ b/fedora-livecd-electronic-lab.ks
@@ -179,7 +179,7 @@ DISPLAYMANAGER="KDE"
EOF
# add initscript qnd # Fedora Electronic Lab: KDE keyboard layouts
-cat >> /etc/rc.d/init.d/fedora-live << EOF
+cat >> /etc/rc.d/init.d/livesys << EOF
if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
# use image also for kdm
@@ -188,9 +188,9 @@ if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
fi
# make fedora user use KDE
-echo "startkde" > /home/fedora/.xsession
-chmod a+x /home/fedora/.xsession
-chown fedora:fedora /home/fedora/.xsession
+echo "startkde" > /home/liveuser/.xsession
+chmod a+x /home/liveuser/.xsession
+chown fedora:fedora /home/liveuser/.xsession
# set up autologin for user fedora
sed -i 's/#AutoLoginEnable=true/AutoLoginEnable=true/' /etc/kde/kdm/kdmrc
diff --git a/fedora-livecd-kde-de_CH.ks b/fedora-livecd-kde-de_CH.ks
index e19fa4f..f508ad1 100644
--- a/fedora-livecd-kde-de_CH.ks
+++ b/fedora-livecd-kde-de_CH.ks
@@ -18,9 +18,9 @@ timezone Europe/Zurich
# set up localized keyboard since it is not used in /etc/X11/xorg.conf anymore and
# KDE don't use /etc/sysconfig/keyboard.
# Replace "sg-latin1-nodeadkeys" with the keyboard layout you have used above
-mkdir -p /home/fedora/.kde/env
-echo "system-config-keyboard --noui sg-latin1-nodeadkeys" > /home/fedora/.kde/env/keyboard.sh
-chmod +x /home/fedora/.kde/env/keyboard.sh
-chown -R fedora:fedora /home/fedora/.kde/env/
+mkdir -p /home/liveuser/.kde/env
+echo "system-config-keyboard --noui sg-latin1-nodeadkeys" > /home/liveuser/.kde/env/keyboard.sh
+chmod +x /home/liveuser/.kde/env/keyboard.sh
+chown -R fedora:fedora /home/liveuser/.kde/env/
%end
diff --git a/fedora-livecd-kde-de_DE.ks b/fedora-livecd-kde-de_DE.ks
index 2f3934a..ecc5654 100644
--- a/fedora-livecd-kde-de_DE.ks
+++ b/fedora-livecd-kde-de_DE.ks
@@ -18,9 +18,9 @@ timezone Europe/Berlin
# set up localized keyboard since it is not used in /etc/X11/xorg.conf anymore and
# KDE don't use /etc/sysconfig/keyboard.
# Replace "de-latin1-nodeadkeys" with the keyboard layout you have used above
-mkdir -p /home/fedora/.kde/env
-echo "system-config-keyboard --noui de-latin1-nodeadkeys" > /home/fedora/.kde/env/keyboard.sh
-chmod +x /home/fedora/.kde/env/keyboard.sh
-chown -R fedora:fedora /home/fedora/.kde/env/
+mkdir -p /home/liveuser/.kde/env
+echo "system-config-keyboard --noui de-latin1-nodeadkeys" > /home/liveuser/.kde/env/keyboard.sh
+chmod +x /home/liveuser/.kde/env/keyboard.sh
+chown -R fedora:fedora /home/liveuser/.kde/env/
%end
\ No newline at end of file
diff --git a/fedora-livecd-kde-pt_PT.ks b/fedora-livecd-kde-pt_PT.ks
index 40c84c4..134bea2 100644
--- a/fedora-livecd-kde-pt_PT.ks
+++ b/fedora-livecd-kde-pt_PT.ks
@@ -18,8 +18,8 @@ timezone Europe/Lisbon
# set up localized keyboard since it is not used in /etc/X11/xorg.conf anymore and
# KDE don't use /etc/sysconfig/keyboard.
# Replace "de-latin1-nodeadkeys" with the keyboard layout you have used above
-mkdir -p /home/fedora/.kde/env
-echo "system-config-keyboard --noui de-latin1-nodeadkeys" > /home/fedora/.kde/env/keyboard.sh
-chmod +x /home/fedora/.kde/env/keyboard.sh
-chown -R fedora:fedora /home/fedora/.kde/env/
+mkdir -p /home/liveuser/.kde/env
+echo "system-config-keyboard --noui de-latin1-nodeadkeys" > /home/liveuser/.kde/env/keyboard.sh
+chmod +x /home/liveuser/.kde/env/keyboard.sh
+chown -R fedora:fedora /home/liveuser/.kde/env/
%end
diff --git a/fedora-livecd-kde.ks b/fedora-livecd-kde.ks
index 38d1131..878a054 100644
--- a/fedora-livecd-kde.ks
+++ b/fedora-livecd-kde.ks
@@ -85,7 +85,7 @@ DISPLAYMANAGER="KDM"
EOF
# add initscript
-cat >> /etc/rc.d/init.d/fedora-live << EOF
+cat >> /etc/rc.d/init.d/livesys << EOF
if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
# use image also for kdm
@@ -94,25 +94,25 @@ if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
fi
# make fedora user use KDE
-echo "startkde" > /home/fedora/.xsession
-chmod a+x /home/fedora/.xsession
-chown fedora:fedora /home/fedora/.xsession
+echo "startkde" > /home/liveuser/.xsession
+chmod a+x /home/liveuser/.xsession
+chown fedora:fedora /home/liveuser/.xsession
# set up autologin for user fedora
sed -i 's/#AutoLoginEnable=true/AutoLoginEnable=true/' /etc/kde/kdm/kdmrc
-sed -i 's/#AutoLoginUser=fred/AutoLoginUser=fedora/' /etc/kde/kdm/kdmrc
+sed -i 's/#AutoLoginUser=fred/AutoLoginUser=liveuser/' /etc/kde/kdm/kdmrc
# set up user fedora as default user and preselected user
sed -i 's/#PreselectUser=Default/PreselectUser=Default/' /etc/kde/kdm/kdmrc
-sed -i 's/#DefaultUser=johndoe/DefaultUser=fedora/' /etc/kde/kdm/kdmrc
+sed -i 's/#DefaultUser=johndoe/DefaultUser=liveuser/' /etc/kde/kdm/kdmrc
# add liveinst.desktop to favorites menu
-mkdir -p /home/fedora/.kde/share/config/
-cat > /home/fedora/.kde/share/config/kickoffrc << MENU_EOF
+mkdir -p /home/liveuser/.kde/share/config/
+cat > /home/liveuser/.kde/share/config/kickoffrc << MENU_EOF
[Favorites]
FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/kde4/systemsettings.desktop,/usr/share/applications/liveinst.desktop
MENU_EOF
-chown -R fedora:fedora /home/fedora/.kde/
+chown -R fedora:fedora /home/liveuser/.kde/
# show liveinst.desktop on and in menu
sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
diff --git a/fedora-livecd-xfce.ks b/fedora-livecd-xfce.ks
index 866197d..1cb7d61 100644
--- a/fedora-livecd-xfce.ks
+++ b/fedora-livecd-xfce.ks
@@ -142,9 +142,9 @@ cat > /etc/sysconfig/desktop <<EOF
PREFERRED=/usr/bin/startxfce4
EOF
-mkdir -p /home/fedora/.config/tracker
+mkdir -p /home/liveuser/.config/tracker
-cat > /home/fedora/.config/tracker/tracker.cfg <<EOF
+cat > /home/liveuser/.config/tracker/tracker.cfg <<EOF
[Indexing]
EnableIndexing=false
Language=en
@@ -157,8 +157,8 @@ EnableIndexing=false
Language=en
EOF
-cat >> /etc/rc.d/init.d/fedora-live << EOF
-chown -R fedora:fedora /home/fedora
+cat >> /etc/rc.d/init.d/livesys << EOF
+chown -R fedora:fedora /home/liveuser
# disable screensaver locking
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-screensaver/lock_enabled false >/dev/null
@@ -166,7 +166,7 @@ gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults
cat >> /etc/gdm/custom.conf << FOE
[daemon]
TimedLoginEnable=true
-TimedLogin=fedora
+TimedLogin=liveuser
TimedLoginDelay=60
FOE
diff --git a/fedora-livedvd-developer.ks b/fedora-livedvd-developer.ks
index deff919..483fb44 100644
--- a/fedora-livedvd-developer.ks
+++ b/fedora-livedvd-developer.ks
@@ -107,9 +107,9 @@ BEGIN {
}' < /etc/yum.repos.d/fedora.repo > /etc/yum.repos.d/fedora.repo.tmp
mv /etc/yum.repos.d/fedora.repo{.tmp,}
-cat >> /etc/rc.d/init.d/fedora-live << EOF
+cat >> /etc/rc.d/init.d/livesys << EOF
# Put link to demonstration videos on the desktop
-pushd /home/fedora/Desktop
+pushd /home/liveuser/Desktop
ln -s /usr/share/eclipse-demos-0.0.1 "Eclipse demonstration videos"
popd
EOF
diff --git a/fedora-livedvd-electronic-lab.ks b/fedora-livedvd-electronic-lab.ks
index 59e9773..0076e13 100644
--- a/fedora-livedvd-electronic-lab.ks
+++ b/fedora-livedvd-electronic-lab.ks
@@ -150,15 +150,15 @@ compat-gcc-34-c++
# Fedora Electronic Lab:
-mkdir -p /home/fedora/.kde/share/config/
+mkdir -p /home/liveuser/.kde/share/config/
# kill stupid klipper
-cat > /home/fedora/.kde/share/config/klipperrc <<EOF
+cat > /home/liveuser/.kde/share/config/klipperrc <<EOF
[General]
AutoStart=false
EOF
-cat > /home/fedora/.kde/share/config/kxkbrc <<EOF
+cat > /home/liveuser/.kde/share/config/kxkbrc <<EOF
[Layout]
DisplayNames=us,ch,de,fr
IndicatorOnly=false
15 years, 9 months
- 1
- 0