main/initscripts
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleaned up init.d/mountfs and added support for ZFS

Browse Source
This commit is contained in:
Jay Larson
2017-06-16 10:46:16 -05:00
parent c635cf014c
commit f977ad5793
2 changed files with 37 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -17,7 +17,7 @@ DESC = This package supplies the base system init scripts for sysvinit
ARCHIVE := '' ARCHIVE := ''
SRCDIR := $(PWD)/SRC/initscripts SRCDIR := $(PWD)/SRC/initscripts
PATCHDIR := $(PWD)/SRC/patches PATCHDIR := $(PWD)/SRC/patches
VERSION := 1.1-1 VERSION := 1.2-0
include /usr/share/snap/Makefile.snaplinux include /usr/share/snap/Makefile.snaplinux

93
SRC/initscripts/init.d/mountfs
View File

@@ -1,17 +1,4 @@
#!/bin/sh #!/bin/sh
########################################################################
# Begin mountfs
#
# Description : File System Mount Script
#
# Authors : Gerard Beekmans - gerard@linuxfromscratch.org
# DJ Lucas - dj@linuxfromscratch.org
# Update : Bruce Dubbs - bdubbs@linuxfromscratch.org
#
# Version : LFS 7.0
#
########################################################################
### BEGIN INIT INFO ### BEGIN INIT INFO
# Provides: $local_fs # Provides: $local_fs
# Required-Start: udev checkfs # Required-Start: udev checkfs
@@ -20,67 +7,59 @@
# Should-Stop: # Should-Stop:
# Default-Start: S # Default-Start: S
# Default-Stop: 0 6 # Default-Stop: 0 6
# Short-Description: Mounts/unmounts local filesystems defined in /etc/fstab. # Short-Description: Mounts/unmounts local filesystems
# Description: Remounts root filesystem read/write and mounts all # Description: Remounts root filesystem read/write and mounts all
# remaining local filesystems defined in /etc/fstab on # remaining local filesystems defined in /etc/fstab or
# start. Remounts root filesystem read-only and unmounts # in ZFS. Remounts root filesystem read-only and unmounts
# remaining filesystems on stop. # remaining filesystems on stop.
# X-LFS-Provided-By: LFS
# X-Required: true # X-Required: true
### END INIT INFO ### END INIT INFO
. /lib/lsb/init-functions . /lib/lsb/init-functions
#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
#
# needs work!!
# probably need to split up
# separate scripts for / and
# network filesystems
#
# Ok, so network filesystems
# init scripts should be included
# as part of the package. This
# script should only be for
# standard local filesystems
#
#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
case "$1" in case "$1" in
start) start)
log_init_msg "Remounting root file system in read-write mode" log_init_msg "Remounting root file system in read-write mode"
mount -o remount,rw / >/dev/null && log_success_msg || log_failure_msg mount -o remount,rw / >/dev/null && log_success_msg || log_failure_msg
# Remove fsck-related file system watermarks. if [ -f /fastboot ]; then
rm -f /fastboot /forcefsck log_init_msg "Clearing /fastboot"
rm /fastboot && log_success_msg || log_failure_msg
fi
# Make sure /dev/pts exists if [ -f /forcefsck ]; then
# mkdir -p /dev/pts log_init_msg "Clearing /forcefsk"
rm /forcefsck && log_success_msg || log_failure_msg
fi
# This will mount all filesystems that do not have _netdev in if [ -x /sbin/zpool ]; then
# their option list. _netdev denotes a network filesystem. if zpool list rpool 2>&1 > /dev/null; then
log_init_msg "Mounting ZFS file systems"
zfs mount -a && log_success_msg || log_failure_msg
fi
fi
log_init_msg "Mounting remaining file systems" log_init_msg "Mounting remaining file systems"
mount -a -O no_netdev >/dev/null && log_success_msg || log_failure_msg mount -a -O no_netdev >/dev/null && log_success_msg || log_failure_msg
exit $failed ;;
;;
stop) stop)
# Don't unmount virtual file systems like /run log_init_msg "Unmounting all file systems"
log_init_msg "Unmounting all file systems" umount -a -d -r -t notmpfs,nosysfs,nodevtmpfs,noproc,nodevpts \
umount -a -d -r -t notmpfs,nosysfs,nodevtmpfs,noproc,nodevpts >/dev/null && \ >/dev/null && log_success_msg || log_failure_msg
log_success_msg || log_failure_msg
# Make sure / is mounted read only (umount bug) if [ -x /sbin/zpool ]; then
mount -o remount,ro / if zpool list rpool 2>&1 > /dev/null; then
log_init_msg "Unmounting ZFS file systems"
zfs umount -a && log_success_msg || log_failure_msg
fi
fi
# Make all LVM volume groups unavailable, if appropriate mount -o remount,ro /
# This fails if swap or / are on an LVM partition ;;
#if [ -x /sbin/vgchange ]; then /sbin/vgchange -an > /dev/null; fi
;;
*) *)
echo "Usage: $0 [start|stop]" echo "Usage: $0 [start|stop]"
exit 1 exit 1
;; ;;
esac esac
exit 0 exit 0