Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.6 grimoire by Jeremy Blosser (ef2ef4c4f71bae44e01f87480bf7ed492d86f51b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jeremy Blosser <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.6 grimoire by Jeremy Blosser (ef2ef4c4f71bae44e01f87480bf7ed492d86f51b)
  • Date: Sun, 21 Jan 2007 02:08:17 -0600

GIT changes to stable-rc-0.6 grimoire by Jeremy Blosser
<jblosser-smgl AT firinn.org>:

smgl/init.d/DETAILS | 2 +-
smgl/init.d/HISTORY | 19 ++++++++++++++++---
smgl/init.d/init.d/devices | 6 +++---
smgl/init.d/init.d/mountall.sh | 29 +++++++++++++++++------------
smgl/init.d/init.d/mountroot.sh | 20 ++++++++++++++++++++
5 files changed, 57 insertions(+), 19 deletions(-)

New commits:
commit ef2ef4c4f71bae44e01f87480bf7ed492d86f51b
Author: Jeremy Blosser <jblosser-smgl AT firinn.org>
Commit: Jeremy Blosser <jblosser-smgl AT firinn.org>

init.d: Try to fix bug 9177 some more; this isn't final but should get us
past
breaking things. This tries to do LVM setup multiple times; ideally it
should
only do it when it will work.

commit f55dbdb052a0cb237eb2f0c5df04ec2e28451332
Author: Jeremy Blosser <jblosser-smgl AT firinn.org>
Commit: Jeremy Blosser <jblosser-smgl AT firinn.org>

Revert "init.d: fix #7311, proc not showing in /etc/mtab"

This reverts commit 95f13eb1ac5a9dc00b73497abf8ed6c792b0d0c7.

commit 6dd035c985e5fe3f8e4288f0c6f73c14c9991308
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Jeremy Blosser <jblosser-smgl AT firinn.org>

dmsetup in init.d/mountall.sh failing is not fatal (simply no dm in
kernel), so omit the retval check

commit d2d735a516812ff647e2bab0d8a15edc5776d490
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Jeremy Blosser <jblosser-smgl AT firinn.org>

enable device mapper nodes discovery in init.d/mountall.sh

diff --git a/smgl/init.d/DETAILS b/smgl/init.d/DETAILS
index ffaa50d..c66e268 100755
--- a/smgl/init.d/DETAILS
+++ b/smgl/init.d/DETAILS
@@ -1,7 +1,7 @@
SPELL=init.d
VERSION=2.2.0
LICENSE[0]=GPL
- PATCHLEVEL=14
+ PATCHLEVEL=17
KEYWORDS="smgl"
ENTERED=20030505
SHORT="This is the basic initalization system of SMGL"
diff --git a/smgl/init.d/HISTORY b/smgl/init.d/HISTORY
index 48e0ae6..c919881 100644
--- a/smgl/init.d/HISTORY
+++ b/smgl/init.d/HISTORY
@@ -1,3 +1,9 @@
+2007-01-18 Jeremy Blosser <jblosser-smgl AT firinn.org>
+ * init.d/devices: Centralize /proc mounting.
+ * init.d{mountroot.sh,mountall.sh}: Try to not break systems that use
+ an initrd and root LVM (bug 9177).
+ * DETAILS: PATCHLEVEL++.
+
2007-01-10 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* CONFIGURE: added check before sourcing devices

@@ -5,9 +11,16 @@
* CONFIGURE: fix #9772, restore the DEVICE settings for the second
cast
added missing &&

-2006-10-15 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
- * init.d/devices: fix #7311, proc not showing in /etc/mtab
- * DETAILS: PATCHLEVEL++
+2006-11-02 Thomas Orgis <sobukus AT sourcemage.org>
+ * init.d/mountall.sh: device mapper may simply fail because no kernel
+ support, so don't bother for error code (spurious red on bood)
+
+2006-10-29 Thomas Orgis <sobukus AT sourcemage.org>
+ * init.d/mountall.sh: add discovery of device mapper
+ nodes (p.ex. crypto swap set up in initramfs)
+
+2006-10-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * INSTALL: use TRACK_ROOT when linking #9163

2006-09-23 Flavien Bridault <vlaaad AT sourcemage.org>
* DEPENDS: Check which udev spell we should cast according to the
diff --git a/smgl/init.d/init.d/devices b/smgl/init.d/init.d/devices
index e69c318..a2db4b1 100755
--- a/smgl/init.d/init.d/devices
+++ b/smgl/init.d/init.d/devices
@@ -32,9 +32,6 @@ start_udev()
# mount sysfs
echo "Mounting sysfs at /sys"
mount -n -t sysfs none /sys
- # mount proc
- echo "Mounting /proc"
- mount -n -t proc none /proc
echo "Mounting ramfs at $udev_root"
mount -n -t ramfs none $udev_root
# create some needed stuff
@@ -94,6 +91,9 @@ start_static()

start()
{
+ # mount proc
+ echo "Mounting /proc"
+ mount -a -n -t proc
eval "start_$DEVICES"
}

diff --git a/smgl/init.d/init.d/mountall.sh b/smgl/init.d/init.d/mountall.sh
index 65bd65c..30d5ca8 100755
--- a/smgl/init.d/init.d/mountall.sh
+++ b/smgl/init.d/init.d/mountall.sh
@@ -51,25 +51,30 @@ checkfs()
rm -f /fastboot /forcefsck
}

-start()
+scanlvm()
{
- required_executable /bin/mount
- required_executable /sbin/fsck
-
- echo "Mounting proc file system..."
- mount -a -t /proc
- evaluate_retval &&
-# bug 7311
- if ! grep -wq "/proc" /etc/mtab; then
- builtin echo 'none /proc proc rw 0 0' >> /etc/mtab
+ # find devices that were set up in initramfs/rd
+ if optional_executable /sbin/dmsetup
+ then
+ echo "(re)Creating device mapper nodes..."
+ # won't check retval because kernel just may lack device mapper
+ /sbin/dmsetup mknodes
fi

if optional_executable /sbin/vgscan && optional_executable /sbin/vgchange
; then
- echo -n "Scanning for and initializing all available LVM volume
groups..."
+ echo "Scanning for and initializing all available LVM volume groups..."
/sbin/vgscan --ignorelockingfailure --mknodes &&
/sbin/vgchange -ay --ignorelockingfailure
- evaluate_retval
fi
+}
+
+start()
+{
+ required_executable /bin/mount
+ required_executable /sbin/fsck
+
+ scanlvm
+ evaluate_retval

checkfs

diff --git a/smgl/init.d/init.d/mountroot.sh b/smgl/init.d/init.d/mountroot.sh
index 4331972..50afe65 100755
--- a/smgl/init.d/init.d/mountroot.sh
+++ b/smgl/init.d/init.d/mountroot.sh
@@ -36,6 +36,23 @@ checkrootfs()
rm -f /fastboot /forcefsck
}

+scanlvm()
+{
+ # find devices that were set up in initramfs/rd
+ if optional_executable /sbin/dmsetup
+ then
+ echo "(re)Creating device mapper nodes..."
+ # won't check retval because kernel just may lack device mapper
+ /sbin/dmsetup mknodes
+ fi
+
+ if optional_executable /sbin/vgscan && optional_executable /sbin/vgchange
; then
+ echo "Scanning for and initializing all available LVM volume groups..."
+ /sbin/vgscan --ignorelockingfailure --mknodes &&
+ /sbin/vgchange -ay --ignorelockingfailure
+ fi
+}
+
start()
{
required_executable /bin/mount
@@ -51,6 +68,9 @@ start()
raidstart --all
fi

+ scanlvm
+ evaluate_retval
+
echo "Mounting root file system read only..."
mount -n -o remount,ro /
evaluate_retval || exit 1



  • [SM-Commit] GIT changes to stable-rc-0.6 grimoire by Jeremy Blosser (ef2ef4c4f71bae44e01f87480bf7ed492d86f51b), Jeremy Blosser, 01/21/2007

Archive powered by MHonArc 2.6.24.

Top of Page