diff --git a/directory.list b/directory.list index d86e169..885ddd2 100644 --- a/directory.list +++ b/directory.list @@ -69,7 +69,6 @@ 0700 root root /root/.gnupg 0755 root root /root/bin 0755 root root /run -1775 root lock /run/lock 0755 root root /sbin 0755 root root /selinux 0755 root root /srv/ftp @@ -175,6 +174,8 @@ 0755 nobody root /var/lib/nobody 0700 root root /var/lib/pam_devperm 0755 wwwrun root /var/lib/wwwrun +1775 root lock /var/lock +0755 root root /var/run 0755 root root /var/spool 0755 lp lp /var/spool/lpd 0770 mail mail /var/spool/clientmqueue diff --git a/filesystem.changes b/filesystem.changes index 0af9943..b294f34 100644 --- a/filesystem.changes +++ b/filesystem.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 6 15:11:22 UTC 2012 - fcrozat@suse.com + +- Revert /var/run and /var/lock being symlinks for now. + ------------------------------------------------------------------- Sat Oct 20 09:03:48 UTC 2012 - coolo@suse.com diff --git a/filesystem.links b/filesystem.links index da72da8..9e40c7f 100644 --- a/filesystem.links +++ b/filesystem.links @@ -1,6 +1,4 @@ # links to be created -../run /var/run -../run/lock /var/lock init.d /etc/rc.d ../var/tmp /usr/tmp ../lock /var/spool/locks diff --git a/filesystem.spec b/filesystem.spec index b14c078..43d2550 100644 --- a/filesystem.spec +++ b/filesystem.spec @@ -187,10 +187,6 @@ test -n "$NON_EXISTING_DIR" && { %pre -p os.remove ("/usr/include/X11") os.remove ("/usr/lib/X11") -os.execute ("mountpoint -q /var/lock && umount -l /var/lock") -os.rename ("/var/lock","/var/lock.migrated") -os.execute ("mountpoint -q /var/run && umount -l /var/run") -os.rename ("/var/run","/var/run.migrated") %files -f filesystem.list