Change sudoers update to only run if /etc/sudoers exists and only reduce splash to...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@556 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index aab812f71bd29886c000b9def0c445c2db42f31a..81f92946d85ee8adfa1316a043d9cdef9bb3424d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.181 2005/03/05 05:12:58 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.182 2005/03/06 14:35:37 wolf31o2 Exp $
+
+  06 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  livecd/runscript-support/livecdfs-update.sh,
+  livecd/runscript-support/pre-kmerge.sh:
+  Change sudoers update to only run if /etc/sudoers exists and only reduce
+  splash to 1024x768 on minimal and universal install CD.
 
   05 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org> targets/grp/grp.sh,
   targets/livecd-stage1/livecd-stage1.sh:

diff --git a/livecd/runscript-support/livecdfs-update.sh b/livecd/runscript-support/livecdfs-update.sh
index 2c1c1e4c8954322e0225e877f6496c401de36a2c..1684a70c8125c47c23c74a61a5382365e0b59166 100755 (executable)
--- a/livecd/runscript-support/livecdfs-update.sh
+++ b/livecd/runscript-support/livecdfs-update.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/livecdfs-update.sh,v 1.32 2005/03/02 02:14:34 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/livecdfs-update.sh,v 1.33 2005/03/06 14:35:37 wolf31o2 Exp $
 
 /usr/sbin/env-update
 source /etc/profile
@@ -75,7 +75,7 @@ echo "gentoo" > /etc/dnsdomainname
 echo "127.0.0.1        livecd.gentoo livecd localhost" > /etc/hosts
 
 # setup sudoers
-sed -i '/NOPASSWD: ALL/ s/^# //' /etc/sudoers
+[ -e /etc/sudoers ] && sed -i '/NOPASSWD: ALL/ s/^# //' /etc/sudoers
 
 # setup dhcp on all detected ethernet devices
 echo "iface_eth0=\"dhcp\""> /etc/conf.d/net

diff --git a/livecd/runscript-support/pre-kmerge.sh b/livecd/runscript-support/pre-kmerge.sh
index 3b0dd7e4d08bae31f8afdcf3dd1147cadfa1ba16..9e0571b782db696fec1c5382a4b53edc884ce7b7 100755 (executable)
--- a/livecd/runscript-support/pre-kmerge.sh
+++ b/livecd/runscript-support/pre-kmerge.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/pre-kmerge.sh,v 1.8 2005/03/02 21:47:41 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/pre-kmerge.sh,v 1.9 2005/03/06 14:35:37 wolf31o2 Exp $
 
 /usr/sbin/env-update
 source /etc/profile
@@ -17,7 +17,7 @@ rm -f /usr/src/linux
 sed -i 's/uchi-hcd/uhci-hcd/' /usr/share/genkernel/x86/modules_load
 
 if [ "${clst_livecd_type}" = "gentoo-release-minimal" ] \
-       [ "${clst_livecd_type}" = "gentoo-release-universal" ]; then
-               sed -i 's/initramfs_data.cpio.gz /initramfs_data.cpio.gz -r 1024x768 /'\
-               /usr/share/genkernel/genkernel
+|| [ "${clst_livecd_type}" = "gentoo-release-universal" ]; then
+       sed -i 's/initramfs_data.cpio.gz /initramfs_data.cpio.gz -r 1024x768 /'\
+       /usr/share/genkernel/genkernel
 fi