[Clfs-commits] [Bootscripts Embedded]Bootscripts for CLFS Embedded branch, master, updated. 682d006084e23b41d241dd46853c1efdb709c696
git
git at cross-lfs.org
Tue Nov 12 11:28:05 PST 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Bootscripts for CLFS Embedded".
The branch, master has been updated
via 682d006084e23b41d241dd46853c1efdb709c696 (commit)
via 959f0b447ae3834290835b1292934c63e527cee9 (commit)
via 6394df1c5dfd593ca700c23db155f3aa9387af5f (commit)
via 3a3ba03e2bc336b13410ae22c95982b3293735c6 (commit)
via e0e7d60f41ced61efcb22ff5f5f8ce64c4430358 (commit)
via d3398c8e275c1b9ad684381839a221c765ec35b1 (commit)
via 6bbb1f07ea4654da65eab3e400680da82dc7ef59 (commit)
via 5c79e0a0f25b69c95360a5c8757b258f80c7bdd4 (commit)
via 2255872a3cc917e978b2fbd0f75ea5871985ed68 (commit)
from b4816b1cd5a50040bed16c40e22faf76701c5d82 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 682d006084e23b41d241dd46853c1efdb709c696
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Tue Nov 12 13:29:28 2013 -0500
startup: Delete /var/run/*
As per FHS, this directory should be cleared at startup.
diff --git a/clfs/rc.d/startup b/clfs/rc.d/startup
index 3a36aaa..2d129b9 100755
--- a/clfs/rc.d/startup
+++ b/clfs/rc.d/startup
@@ -68,6 +68,7 @@ hostname -F /etc/HOSTNAME
check_status
echo -n "Cleaning up system: "
+rm -rf /var/run/*
> /var/run/utmp
touch /var/log/wtmp
touch /var/log/messages
@@ -75,7 +76,6 @@ chmod 0664 /var/run/utmp
chmod 0664 /var/log/wtmp
chmod 0660 /var/log/messages
rm -rf /tmp/*
-rm -f /var/run/*.pid
check_status
echo -n "Setting up interface lo: "
commit 959f0b447ae3834290835b1292934c63e527cee9
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Tue Nov 12 13:06:43 2013 -0500
startup: Fix mounting of /dev/pts
diff --git a/clfs/rc.d/startup b/clfs/rc.d/startup
index 267be36..3a36aaa 100755
--- a/clfs/rc.d/startup
+++ b/clfs/rc.d/startup
@@ -17,7 +17,7 @@ echo -n "Starting mdev: "
check_status
echo -n "Mounting devpts: "
-mount /dev/pts
+/bin/mount -t devpts none /dev/pts
check_status
echo -n "Mounting shared memory: "
commit 6394df1c5dfd593ca700c23db155f3aa9387af5f
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Tue Nov 12 13:05:15 2013 -0500
startup: Mount /dev/shm
diff --git a/clfs/rc.d/startup b/clfs/rc.d/startup
index 98f1e4d..267be36 100755
--- a/clfs/rc.d/startup
+++ b/clfs/rc.d/startup
@@ -20,6 +20,10 @@ echo -n "Mounting devpts: "
mount /dev/pts
check_status
+echo -n "Mounting shared memory: "
+/bin/mount -t tmpfs none /dev/shm
+check_status
+
if [ -x /sbin/hwclock ] && [ -e /dev/rtc0 ]; then
echo -n "Setting system clock: "
hwclock --hctosys --utc
commit 3a3ba03e2bc336b13410ae22c95982b3293735c6
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Tue Nov 12 10:07:14 2013 -0500
startup/shutdown: Use /dev/rtc0
The first RTC will be number 0.
diff --git a/clfs/rc.d/shutdown b/clfs/rc.d/shutdown
index beb7d0e..af645cc 100755
--- a/clfs/rc.d/shutdown
+++ b/clfs/rc.d/shutdown
@@ -19,7 +19,7 @@ do
fi
done
-if [ -x /sbin/hwclock ] && [ -e /dev/rtc ]; then
+if [ -x /sbin/hwclock ] && [ -e /dev/rtc0 ]; then
echo -n "Syncing system clock to hardware clock: "
hwclock --systohc --utc
check_status
diff --git a/clfs/rc.d/startup b/clfs/rc.d/startup
index e43c8d0..98f1e4d 100755
--- a/clfs/rc.d/startup
+++ b/clfs/rc.d/startup
@@ -20,7 +20,7 @@ echo -n "Mounting devpts: "
mount /dev/pts
check_status
-if [ -x /sbin/hwclock ] && [ -e /dev/rtc* ]; then
+if [ -x /sbin/hwclock ] && [ -e /dev/rtc0 ]; then
echo -n "Setting system clock: "
hwclock --hctosys --utc
check_status
commit e0e7d60f41ced61efcb22ff5f5f8ce64c4430358
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Tue Nov 12 10:06:24 2013 -0500
startup: Move /var/tmp symlink later
It cannot work if root is ro until after root is remounted rw.
diff --git a/clfs/rc.d/startup b/clfs/rc.d/startup
index e42181f..e43c8d0 100755
--- a/clfs/rc.d/startup
+++ b/clfs/rc.d/startup
@@ -9,7 +9,6 @@
/bin/mount -t tmpfs /tmp /tmp
/bin/mkdir /dev/pts
/bin/mkdir /dev/shm
-ln -s ../tmp /var/tmp
/bin/echo "/sbin/mdev" > /proc/sys/kernel/hotplug
@@ -56,6 +55,10 @@ echo -n "Remounting root rw: "
mount -o remount,rw /
check_status
+echo -n "Linking /var/tmp and /tmp: "
+ln -s ../tmp /var/tmp
+check_status
+
echo -n "Setting hostname: "
hostname -F /etc/HOSTNAME
check_status
commit d3398c8e275c1b9ad684381839a221c765ec35b1
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Tue Nov 12 10:05:30 2013 -0500
startup: Don't mount tmpfs on /dev
That's what DEVTMPFS is for and it's done automatically.
diff --git a/clfs/rc.d/startup b/clfs/rc.d/startup
index 77ce9eb..e42181f 100755
--- a/clfs/rc.d/startup
+++ b/clfs/rc.d/startup
@@ -7,7 +7,6 @@
/bin/mount -t proc none /proc
/bin/mount -t sysfs none /sys
/bin/mount -t tmpfs /tmp /tmp
-/bin/mount -t tmpfs -o mode=0755 none /dev
/bin/mkdir /dev/pts
/bin/mkdir /dev/shm
ln -s ../tmp /var/tmp
commit 6bbb1f07ea4654da65eab3e400680da82dc7ef59
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Tue Oct 22 13:53:51 2013 -0400
shutdown: Only swapoff if fstab exists
Or else swapoff complains about lack of fstab and apparently can't find
where swap is.
diff --git a/clfs/rc.d/shutdown b/clfs/rc.d/shutdown
index cf60a38..beb7d0e 100755
--- a/clfs/rc.d/shutdown
+++ b/clfs/rc.d/shutdown
@@ -25,7 +25,7 @@ if [ -x /sbin/hwclock ] && [ -e /dev/rtc ]; then
check_status
fi
-if [ -x /sbin/swapoff ]; then
+if [ -x /sbin/swapoff ] && [ -s /etc/fstab ]; then
echo -n "Disabling swap space: "
swapoff -a
check_status
commit 5c79e0a0f25b69c95360a5c8757b258f80c7bdd4
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Tue Oct 22 13:53:11 2013 -0400
shutdown: Match echo line to actual rtc write
diff --git a/clfs/rc.d/shutdown b/clfs/rc.d/shutdown
index 74fa214..cf60a38 100755
--- a/clfs/rc.d/shutdown
+++ b/clfs/rc.d/shutdown
@@ -20,7 +20,7 @@ do
done
if [ -x /sbin/hwclock ] && [ -e /dev/rtc ]; then
- echo -n "Syncing hardware clock to system clock:"
+ echo -n "Syncing system clock to hardware clock: "
hwclock --systohc --utc
check_status
fi
commit 2255872a3cc917e978b2fbd0f75ea5871985ed68
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Mon Oct 21 15:38:17 2013 -0400
startup: Don't mount /var as tmpfs
We create the /var and subdirectories in the book, there's no need to
make them tmpfs in startupscripts.
diff --git a/clfs/rc.d/startup b/clfs/rc.d/startup
index bd69065..77ce9eb 100755
--- a/clfs/rc.d/startup
+++ b/clfs/rc.d/startup
@@ -10,8 +10,6 @@
/bin/mount -t tmpfs -o mode=0755 none /dev
/bin/mkdir /dev/pts
/bin/mkdir /dev/shm
-/bin/mount -t tmpfs -o mode=0755 /var /var
-for x in cache lib lib/misc lib/locate local lock log mail opt run spool; do mkdir /var/$x; done
ln -s ../tmp /var/tmp
/bin/echo "/sbin/mdev" > /proc/sys/kernel/hotplug
-----------------------------------------------------------------------
Summary of changes:
clfs/rc.d/shutdown | 6 +++---
clfs/rc.d/startup | 18 +++++++++++-------
2 files changed, 14 insertions(+), 10 deletions(-)
hooks/post-receive
--
Bootscripts for CLFS Embedded
More information about the Clfs-commits
mailing list