[SM-Commit] PERFORCE change 78229 by Jeremy Blosser for review
Perforce Review Daemon
p4review at smee.org
Sat Apr 22 23:35:00 EDT 2006
Change 78229 by jeremy_blosser at jeremy_blosser-shale on 2006/04/23 04:30:58
integrate
Affected files ...
... //sgl/grimoires/test/smgl/init.d/HISTORY#42 integrate
... //sgl/grimoires/test/smgl/init.d/PREPARE#3 integrate
Differences ...
==== //sgl/grimoires/test/smgl/init.d/HISTORY#42 (text) ====
@@ -1,3 +1,7 @@
+2006-04-22 Jeremy Blosser <jblosser-smgl at firinn.org>
+ * PREPARE: Make sure $INSTALL_ROOT/etc/sysconfig/facilities exists
+ before grepping it.
+
2006-04-10 Jeremy Blosser <jblosser-smgl at firinn.org>
* files/smgl_init: Make it so WANTS are actually optional.
* DETAILS: PATCHLEVEL++
==== //sgl/grimoires/test/smgl/init.d/PREPARE#3 (xtext) ====
@@ -43,7 +43,9 @@
# Kludge to make sure the prompts to set the default providers for the new (in
# init.d 2.2.0) facilities default to "y" the first time so we don't make
# systems unbootable after an unattended update. Remove during stable-rc/0.7.
-if ! grep -q "root_fs" /etc/sysconfig/facilities ; then
- echo -e "\nroot_fs=mountroot.sh" >>/etc/sysconfig/facilities
+if [ -r $INSTALL_ROOT/etc/sysconfig/facilities ] && \
+ ! grep -q "root_fs" $INSTALL_ROOT/etc/sysconfig/facilities
+then
+ echo -e "\nroot_fs=mountroot.sh" >> $INSTALL_ROOT/etc/sysconfig/facilities
fi
More information about the SM-Commit
mailing list