From d0619eb2ecd9b68a64ab7a60c6a2deacfcd185410ec2389e192410e844bb414b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Tue, 25 Sep 2012 19:26:46 +0000 Subject: [PATCH 1/4] Accepting request 135935 from home:fcrozat:branches:Base:System - replace /var/run and /var/lock directories with symlinks to /run and /run/lock (respectively). (this is required by recent systemd) OBS-URL: https://build.opensuse.org/request/show/135935 OBS-URL: https://build.opensuse.org/package/show/Base:System/filesystem?expand=0&rev=89 --- directory.list | 3 +-- filesystem.changes | 6 ++++++ filesystem.links | 2 ++ filesystem.spec | 11 +++++++++++ 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/directory.list b/directory.list index 45af17f..57463d9 100644 --- a/directory.list +++ b/directory.list @@ -69,6 +69,7 @@ 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 /sbin/conf.d 0755 root root /selinux @@ -175,8 +176,6 @@ 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 a402c45..1798a23 100644 --- a/filesystem.changes +++ b/filesystem.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 25 12:30:57 UTC 2012 - fcrozat@suse.com + +- replace /var/run and /var/lock directories with symlinks to + /run and /run/lock (respectively). + ------------------------------------------------------------------- Thu Sep 20 13:46:26 CEST 2012 - kukuk@suse.de diff --git a/filesystem.links b/filesystem.links index 9e40c7f..da72da8 100644 --- a/filesystem.links +++ b/filesystem.links @@ -1,4 +1,6 @@ # 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 a62e350..035e732 100644 --- a/filesystem.spec +++ b/filesystem.spec @@ -183,6 +183,10 @@ 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 @@ -196,4 +200,11 @@ the home directories of system users. + + + + + + + %changelog From f852003cf0125fdc91e53acaaf577e7c364ab97adfefdc76d71daa834089abdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Wed, 26 Sep 2012 04:56:17 +0000 Subject: [PATCH 2/4] Accepting request 135978 from home:a_jaeger:FactoryFix remove /sbin/conf.d/ as SuSEconfig directory OBS-URL: https://build.opensuse.org/request/show/135978 OBS-URL: https://build.opensuse.org/package/show/Base:System/filesystem?expand=0&rev=90 --- directory.list | 1 - filesystem.changes | 5 +++++ filesystem.spec | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/directory.list b/directory.list index 57463d9..d86e169 100644 --- a/directory.list +++ b/directory.list @@ -71,7 +71,6 @@ 0755 root root /run 1775 root lock /run/lock 0755 root root /sbin -0755 root root /sbin/conf.d 0755 root root /selinux 0755 root root /srv/ftp 0755 root root /srv/www diff --git a/filesystem.changes b/filesystem.changes index 1798a23..68bcf1c 100644 --- a/filesystem.changes +++ b/filesystem.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 25 19:49:58 UTC 2012 - aj@suse.de + +- Remove also /sbin/conf.d/ (SuSEconfig directory). + ------------------------------------------------------------------- Tue Sep 25 12:30:57 UTC 2012 - fcrozat@suse.com diff --git a/filesystem.spec b/filesystem.spec index 035e732..a3bdc40 100644 --- a/filesystem.spec +++ b/filesystem.spec @@ -207,4 +207,5 @@ the home directories of system users. + %changelog From af860344abac7acbf4ecf945a71691450d6f5e32340da24ab01ee80500cc5f45 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sat, 6 Oct 2012 13:14:58 +0000 Subject: [PATCH 3/4] fix spec file OBS-URL: https://build.opensuse.org/package/show/Base:System/filesystem?expand=0&rev=91 --- filesystem.spec | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/filesystem.spec b/filesystem.spec index a3bdc40..b5ad304 100644 --- a/filesystem.spec +++ b/filesystem.spec @@ -32,6 +32,10 @@ Source3: ghost.list Source4: languages.man Source64: directory.list64 +%description +This package installs the basic directory structure. It also includes +the home directories of system users. + %prep %setup -c -n filesystem -T @@ -190,22 +194,4 @@ os.rename ("/var/run","/var/run.migrated") %files -f filesystem.list -%description -This package installs the basic directory structure. It also includes -the home directories of system users. - - - - - - - - - - - - - - - %changelog From a7b3d5be720bb9a07f0087920b2c08bfc71b383aac6e27b43efaa9be5aeb3d4d Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 12 Oct 2012 14:25:18 +0000 Subject: [PATCH 4/4] - own /usr/lib/tmpfiles.d OBS-URL: https://build.opensuse.org/package/show/Base:System/filesystem?expand=0&rev=92 --- directory.list | 1 + filesystem.changes | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/directory.list b/directory.list index d86e169..6c8646e 100644 --- a/directory.list +++ b/directory.list @@ -87,6 +87,7 @@ 0755 root root /usr/include 0755 root root /usr/include/X11 0755 root root /usr/lib +0755 root root /usr/lib/tmpfiles.d 0755 root root /usr/lib/X11 0755 root root /usr/lib/lsb 0755 root root /usr/lib/news diff --git a/filesystem.changes b/filesystem.changes index 68bcf1c..d4e5b35 100644 --- a/filesystem.changes +++ b/filesystem.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 12 14:25:04 UTC 2012 - coolo@suse.com + +- own /usr/lib/tmpfiles.d + ------------------------------------------------------------------- Tue Sep 25 19:49:58 UTC 2012 - aj@suse.de