From 10407721eade4aa96593b49df1f38ed8aac55935 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Fri, 9 Dec 2005 17:26:21 +0000 Subject: [PATCH] Made sed on devfsd.conf conditional on it existing. Removes one more error message from a standard catalyst run. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@958 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 7 ++++++- targets/support/livecdfs-update.sh | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 78190da2..58d3cb29 100644 --- 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 + 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 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 bc9661a8..badf2f21 100755 --- 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 -- 2.26.2