diff options
| author | Bill Nottingham <notting@redhat.com> | 2004-07-07 20:38:02 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2004-07-07 20:38:02 +0000 |
| commit | 179e85006c4b278860d4effbc4ddfc06779acc81 (patch) | |
| tree | e6d8653e829dc503473336c0af06e747d13f87cd /rc.d/rc.sysinit | |
| parent | 59f9e229092c5fd41d5a8cad5a7655a610ca01e5 (diff) | |
| download | initscripts-179e85006c4b278860d4effbc4ddfc06779acc81.tar initscripts-179e85006c4b278860d4effbc4ddfc06779acc81.tar.gz initscripts-179e85006c4b278860d4effbc4ddfc06779acc81.tar.bz2 initscripts-179e85006c4b278860d4effbc4ddfc06779acc81.tar.xz initscripts-179e85006c4b278860d4effbc4ddfc06779acc81.zip | |
move random stuff to rc.sysinit/halt; move all swap to after this.
prereq of bug #123278
Diffstat (limited to 'rc.d/rc.sysinit')
| -rwxr-xr-x | rc.d/rc.sysinit | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 30530c05..de29ff4a 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -403,10 +403,6 @@ if [ -f /etc/lvmtab ]; then fi fi -# Start up swapping. -update_boot_stage RCswap -action $"Activating swap partitions: " swapon -a -e - # Clean up SELinux labels if [ -n "$SELINUX" ]; then for file in /etc/mtab /etc/ld.so.cache ; do @@ -428,8 +424,6 @@ mount -f /dev/pts [ -f /proc/bus/usb/devices ] && mount -f -t usbdevfs usbdevfs /proc/bus/usb [ -e /dev/.devfsd ] && mount -f -t devfs devfs /dev - - # The root filesystem is now read-write, so we can now log # via syslog() directly.. if [ -n "$IN_INITLOG" ]; then @@ -643,6 +637,16 @@ if [ -x /sbin/quotaon ]; then action $"Enabling local filesystem quotas: " /sbin/quotaon -aug fi +# Initialize pseudo-random number generator +if [ -f "/var/lib/random-seed" ]; then + cat /var/lib/random-seed > /dev/urandom +else + touch /var/lib/random-seed +fi +chmod 600 /var/lib/random-seed +dd if=/dev/urandom of=/var/lib/random-seed count=1 bs=512 2>/dev/null + + # Configure machine if necessary. if [ -f /.unconfigured ]; then if [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --ping ; then @@ -732,9 +736,9 @@ mkdir -m 1777 -p /tmp/.ICE-unix >/dev/null 2>&1 chown root:root /tmp/.ICE-unix [ -n "$SELINUX" ] && restorecon /tmp/.ICE-unix -# Now turn on swap in case we swap to files. -swapon -a -action $"Enabling swap space: " /bin/true +# Start up swapping. +update_boot_stage RCswap +action $"Enabling swap space: " swapon -a -e # Initialize the serial ports. if [ -f /etc/rc.serial ]; then |