2 Commits
1.6.1 ... 1.7.1

Author SHA1 Message Date
fbt
22bb388fdb more robust umount 2015-03-02 18:02:16 +03:00
fbt
8af7868947 even better: configurable tpdirs and tmpfiles creation 2015-03-02 18:00:23 +03:00

21
rc.in
View File

@@ -14,6 +14,9 @@ cfg_mounts+=( 'shm:tmpfs:/dev/shm:defaults,mode=0777' )
# Some temporary directories # Some temporary directories
cfg_tmpdirs+=( '/run/lock' '/run/lock/lvm' '/run/lvm' '/run/user' ) cfg_tmpdirs+=( '/run/lock' '/run/lock/lvm' '/run/lvm' '/run/user' )
# And temporary files
cfg_tmpfiles+=( '/run/utmp' )
# Functions # Functions
rc.rescue() { exec "${cfg_rc_rescue_shell:-"$SHELL"}"; } rc.rescue() { exec "${cfg_rc_rescue_shell:-"$SHELL"}"; }
@@ -27,8 +30,15 @@ rc.motd() {
return 0 return 0
} }
rc.tmpdirs() { rc.tmpfiles() {
mkdir -p -m0755 "${cfg_tmpdirs[@]}" printf '%s\n' "${cfg_tmpdirs[@]}" | while IFS=':' read dir perm; do
mkdir -v -m "${perm:-755}" "$dir"
done
printf '%s\n' "${cfg_tmpfiles[@]}" | while IFS=':' read file perm; do
> "$file"
chmod -v "${perm:-644}" "$file"
done
} }
rc.mount_misc() { rc.mount_misc() {
@@ -104,7 +114,7 @@ rc.stop_everything() {
rc.unmount_everything() { rc.unmount_everything() {
echo "Unmounting filesystems..." echo "Unmounting filesystems..."
umount -a umount -r -a
} }
rc.remount_root() { rc.remount_root() {
@@ -114,7 +124,6 @@ rc.remount_root() {
rc.boot() { rc.boot() {
rc.mount_misc rc.mount_misc
rc.tmpdirs
rc.tmpfiles rc.tmpfiles
rc.hostname rc.hostname
rc.timezone rc.timezone
@@ -160,10 +169,6 @@ rc.timezone() {
} }
} }
rc.tmpfiles() {
>/run/utmp
}
rc.main() { rc.main() {
source "@ETC@/rc.conf" source "@ETC@/rc.conf"