Switch out references to fedora in initscript and username to be generic

This commit is contained in:
Jeremy Katz
2008-10-02 11:05:16 -04:00
parent 0069b15522
commit ca2f8913a2
12 changed files with 59 additions and 59 deletions

View File

@@ -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*