Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] PERFORCE change 78582 by Jeremy Blosser for review

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Perforce Review Daemon <p4review AT smee.org>
  • To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "David Michael Leo Brown Jr." <dmlb2000 AT gmail.com>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "Ladislav Hagara" <ladislav.hagara AT unob.cz>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
  • Subject: [SM-Commit] PERFORCE change 78582 by Jeremy Blosser for review
  • Date: Fri, 28 Apr 2006 14:50:00 +0100 (BST)

Change 78582 by jeremy_blosser@jeremy_blosser-shale on 2006/04/28 14:45:04

integrate fix for 11375

Affected files ...

... //sgl/grimoires/test/kernels/module-init-tools/HISTORY#22 integrate
... //sgl/grimoires/test/kernels/module-init-tools/PREPARE#5 integrate
... //sgl/grimoires/test/kernels/module-init-tools/UP_TRIGGERS#2 integrate
... //sgl/grimoires/test/smgl/init.d/HISTORY#43 integrate
... //sgl/grimoires/test/smgl/init.d/UP_TRIGGERS#2 integrate

Differences ...

==== //sgl/grimoires/test/kernels/module-init-tools/HISTORY#22 (text) ====

@@ -1,3 +1,7 @@
+2006-04-28 Jeremy Blosser <jblosser-smgl AT firinn.org>
+ * PREPARE, UP_TRIGGERS: Make sure
+ $INSTALL_ROOT/etc/sysconfig/facilities exists before grepping it.
+
2006-04-13 Juuso Alasuutari <iuso AT sourcemage.org>
* INSTALL: Changed cp to install_config_file


==== //sgl/grimoires/test/kernels/module-init-tools/PREPARE#5 (xtext) ====

@@ -1,7 +1,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 "modules" /etc/sysconfig/facilities ; then
- echo -e "\nmodules=modutils" >>/etc/sysconfig/facilities
+if [ -r $INSTALL_ROOT/etc/sysconfig/facilities ] && \
+ ! grep -q "modules" $INSTALL_ROOT/etc/sysconfig/facilities
+then
+ echo -e "\nmodules=modutils" >> $INSTALL_ROOT/etc/sysconfig/facilities
fi


==== //sgl/grimoires/test/kernels/module-init-tools/UP_TRIGGERS#2 (xtext) ====

@@ -1,5 +1,7 @@
# make sure they don't update modutils without also getting the updated
# init.d that provides the "root_fs" facility
-if ! grep -q "root_fs" /etc/sysconfig/facilities ; then
+if [ -r $INSTALL_ROOT/etc/sysconfig/facilities ] && \
+ ! grep -q "root_fs" $INSTALL_ROOT/etc/sysconfig/facilities
+then
spell_ok init.d && up_trigger init.d cast_self
fi

==== //sgl/grimoires/test/smgl/init.d/HISTORY#43 (text) ====

@@ -1,3 +1,7 @@
+2006-04-28 Jeremy Blosser <jblosser-smgl AT firinn.org>
+ * UP_TRIGGERS: Make sure $INSTALL_ROOT/etc/sysconfig/facilities exists
+ before grepping it.
+
2006-04-22 Jeremy Blosser <jblosser-smgl AT firinn.org>
* PREPARE: Make sure $INSTALL_ROOT/etc/sysconfig/facilities exists
before grepping it.

==== //sgl/grimoires/test/smgl/init.d/UP_TRIGGERS#2 (xtext) ====

@@ -1,5 +1,7 @@
# make sure they don't cast init.d 2.2.0 without also getting the updated
# module-init-tools that provides the "modules" facility
-if ! grep -q "modules" /etc/sysconfig/facilities ; then
+if [ -r $INSTALL_ROOT/etc/sysconfig/facilities ] && \
+ ! grep -q "modules" $INSTALL_ROOT/etc/sysconfig/facilities
+then
spell_ok module-init-tools && up_trigger module-init-tools cast_self
fi



  • [SM-Commit] PERFORCE change 78582 by Jeremy Blosser for review, Perforce Review Daemon, 04/28/2006

Archive powered by MHonArc 2.6.24.

Top of Page