Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel cauldron by Karsten Behrmann <BearPerson@sourcemage.org> Karsten Behrmann (52be2bea7917b62b6a35fcd016c82ccca732e53c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: "Karsten Behrmann <BearPerson AT sourcemage.org> Karsten Behrmann" <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel cauldron by Karsten Behrmann <BearPerson AT sourcemage.org> Karsten Behrmann (52be2bea7917b62b6a35fcd016c82ccca732e53c)
  • Date: Tue, 6 Jun 2006 12:32:24 -0500

GIT changes to devel cauldron by Karsten Behrmann <BearPerson AT sourcemage.org>
Karsten Behrmann <BearPerson AT sourcemage.org>:

ChangeLog | 8 ++++++++
iso/data/iso.command | 4 ----
iso/skeleton/etc/fstab | 5 +++--
iso/skeleton/etc/init.d/runlevels/%S/mountroot.sh | 15 +++++++++------
4 files changed, 20 insertions(+), 12 deletions(-)

New commits:
commit 52be2bea7917b62b6a35fcd016c82ccca732e53c
Merge: 79546cb... b92ff78...
Author: Karsten Behrmann <BearPerson AT sourcemage.org>
Commit: Karsten Behrmann <BearPerson AT sourcemage.org>

Merge branch 'master' of ssh://scm.sourcemage.org/smgl/cauldron

Conflicts:

ChangeLog

commit 79546cb64eeac52bf91a2e3da4005f9ebf94b571
Author: Karsten Behrmann <BearPerson AT sourcemage.org>
Commit: Karsten Behrmann <BearPerson AT sourcemage.org>

Move our bootstrap init script to something more fitting
At the same time, overrule the normal mountroot.sh that doesn't work for
ISOs anyway

diff --git a/ChangeLog b/ChangeLog
index c9d8573..f401ddb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-06 Karsten Behrmann <BearPerson AT gmx.net>
+ * skeleton/etc/init.d/runlevels/mountroot.sh: rename our bootstrap
+ script to an existing one that we don't want,
+ that ordinarily does something similar
+
2006-06-06 David Kowis <dkowis AT shlrm.org>
* modules/bootloader: Fixed lilo description bug 10028
* modules/diskStructure: fixed bug 10745
@@ -26,6 +31,9 @@
* skeleton/usr/share/smgl.install/modules/diskStructure: added support
for formating and mounting lvm partitions

+2006-04-02 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * data/iso.command, skeleton/etc/init.d/runlevels/tmpfs.sh: --hack
+
2006-03-31 Karsten Behrmann <BearPerson AT sourcemage.org>
* caster: fixes with detection if a spell needs to be updated
* nightlybuild.sh: fix typo in log naming
diff --git a/iso/data/iso.command b/iso/data/iso.command
index 054f177..fc38f72 100755
--- a/iso/data/iso.command
+++ b/iso/data/iso.command
@@ -1,9 +1,5 @@
#!/bin/bash

-# Silly hack because perforce doesn't like the pathname
-mv $ISO_DIR/etc/init.d/runlevels/tmpfs.sh \
- $ISO_DIR/etc/init.d/runlevels/%DEV/tmpfs.sh
-
touch ${ISO_DIR}/etc/modules.devfsd # can't generate those on the fly,
touch ${ISO_DIR}/etc/modules.conf # just make sure they exist
touch ${ISO_DIR}/etc/modules
diff --git a/iso/skeleton/etc/fstab b/iso/skeleton/etc/fstab
index 15b878c..a0d70b2 100644
--- a/iso/skeleton/etc/fstab
+++ b/iso/skeleton/etc/fstab
@@ -3,7 +3,8 @@ tmpfs /dev/shm tmpfs defaults 0 0
tmpfs /dev/mapper tmpfs defaults 0 0
devpts /dev/pts devpts defaults 0 0
tmpfs /var/lock tmpfs defaults 0 0
-tmpfs /var/log tmpfs defaults 0 0
+#tmpfs /var/log tmpfs defaults 0 0
+#tmpfs /tmp tmpfs defaults 0 0
+# done by mountroot.sh
tmpfs /var/run tmpfs defaults 0 0
-tmpfs /tmp tmpfs defaults 0 0
sysfs /sys sysfs defaults 0 0
diff --git a/iso/skeleton/etc/init.d/runlevels/%DEV/tmpfs.sh
b/iso/skeleton/etc/init.d/runlevels/%S/mountroot.sh
similarity index 70%
rename from iso/skeleton/etc/init.d/runlevels/%DEV/tmpfs.sh
rename to iso/skeleton/etc/init.d/runlevels/%S/mountroot.sh
index 379418d..a4a285a 100755
--- a/iso/skeleton/etc/init.d/runlevels/%DEV/tmpfs.sh
+++ b/iso/skeleton/etc/init.d/runlevels/%S/mountroot.sh
@@ -1,7 +1,8 @@
#!/bin/sh

PROGRAM=/bin/false
-RUNLEVEL=DEV
+RUNLEVEL=S
+PROVIDES=root_fs
ESSENTIAL=yes

. /etc/init.d/smgl_init
@@ -16,9 +17,13 @@ start()
required_executable /bin/mkdir
required_executable /bin/cp

- echo "Mounting tmpfs..."
- /bin/mount -t tmpfs tmpfs /tmp
- evaluate_retval
+ if ! { >/tmp/writable ; } 2>/dev/null ;then
+ # Allow the user to mount something else to /tmp (hard drive, to save
RAM)
+ # Note that we don't have anything that would do so yet...
+ echo "Mounting tmpfs to /tmp..."
+ /bin/mount -t tmpfs tmpfs /tmp
+ evaluate_retval
+ fi

for i in etc root var/log var/lib/nfs ;do
echo "setting up a writeable /$i..."
@@ -27,8 +32,6 @@ start()
/bin/mount --bind /tmp/$i /$i
evaluate_retval
done
-
- /bin/mount proc -t proc /proc
}

stop()



  • [SM-Commit] GIT changes to devel cauldron by Karsten Behrmann <BearPerson AT sourcemage.org> Karsten Behrmann (52be2bea7917b62b6a35fcd016c82ccca732e53c), Karsten Behrmann <BearPerson AT sourcemage.org> Karsten Behrmann, 06/06/2006

Archive powered by MHonArc 2.6.24.

Top of Page