Made sed on devfsd.conf conditional on it existing. Removes one more error message...

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

diff --git a/ChangeLog b/ChangeLog
index 78190da26344fa1bbd57d127d0f1dd9d0db33518..58d3cb294a5790713d8834e8b1707da0be05093e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.445 2005/12/09 17:22:57 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.446 2005/12/09 17:26:21 wolf31o2 Exp $
+
+  09 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/support/livecdfs-update.sh:
+  Made sed on devfsd.conf conditional on it existing. Removes one more error
+  message from a standard catalyst run.
 
   09 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> files/catalyst.conf:
   Added warning about breaking snapshot cache and re-enable autoresume, since

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index bc9661a808b3a923cb8cf97acc30ae1a123490d3..badf2f215d8993fe80ee5bc319520af99a8982dd 100755 (executable)
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.28 2005/12/09 14:46:38 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.29 2005/12/09 17:26:21 wolf31o2 Exp $
 
 . /tmp/chroot-functions.sh
 update_env_settings
@@ -87,7 +87,7 @@ then
 fi
 
 # devfs tweaks
-sed -i '/dev-state/ s:^:#:' /etc/devfsd.conf
+[ -e /etc/devfsd.conf ] && sed -i '/dev-state/ s:^:#:' /etc/devfsd.conf
 
 # tweak the livecd fstab so that users know not to edit it
 # http://bugs.gentoo.org/show_bug.cgi?id=60887