Permalink
Browse files

Merge branch 'master' of github.com:pardus-anka/2013

  • Loading branch information...
2 parents 161df21 + e34d4a3 commit aa54d42e1c6b48ad983dc44d5c4dff7a616959ac @namso-01 namso-01 committed Oct 16, 2012
@@ -107,6 +107,27 @@ def postInstall(fromVersion, fromRelease, toVersion, toRelease):
# for "include" statement.
shutil.copy("/usr/share/baselayout/ld.so.conf", "/etc")
+ if fromRelease and int(fromRelease) < 177:
+ # Release 177 starts using /run and /run/lock instead of
+ # /var/run and /var/lock respectively
+ for i in os.listdir("/var/run"):
+ path = os.path.join("/var/run",i)
+ try:
+ if os.path.isdir(path):
+ shutil.copytree(path, "/run/"+i)
+ if os.path.isfile(path):
+ shutil.copy2(path, "/run/"+i)
+ except:
+ pass
+
+ shutil.rmtree("/run/lock")
+ shutil.copytree("/var/lock","/run/lock")
+
+ shutil.rmtree("/var/lock")
+ os.symlink("../run/lock", "/var/lock")
+ shutil.rmtree("/var/run")
+ os.symlink("../run", "/var/run")
+
##################################
# Merge new system groups
# addGroup(gid, name)
@@ -14,7 +14,7 @@
<IsA>data</IsA>
<Summary>Filesystem baselayout</Summary>
<Description>baselayout creates the Pardus Linux main filesystem hierarchy.</Description>
- <Archive sha1sum="16dd364f1506211d9a82c43b5c33cdd82553a569" type="targz">http://cekirdek.pardus.org.tr/~ozan/dist/sources/baselayout-3.5.2.tar.gz</Archive>
+ <Archive sha1sum="99b4e460dfcac089136519fcae330eb506013efe" type="targz">http://sources.pardus-linux.org/baselayout-3.6.0.tar.gz</Archive>
</Source>
<Package>
@@ -35,6 +35,7 @@
<Path fileType="data" permanent="true">/mnt</Path>
<Path fileType="data" permanent="true">/opt</Path>
<Path fileType="data" permanent="true">/dev</Path>
+ <Path fileType="data" permanent="true">/run</Path>
<Path fileType="data" permanent="true">/sys</Path>
<Path fileType="data" permanent="true">/srv</Path>
<Path fileType="data" permanent="true">/tmp</Path>
@@ -63,6 +64,13 @@
</Package>
<History>
+ <Update release="177">
+ <Date>2012-10-16</Date>
+ <Version>3.6.0</Version>
+ <Comment>New release</Comment>
+ <Name>Erdem Artan</Name>
+ <Email>erdem@pardus-linux.org</Email>
+ </Update>
<Update release="176">
<Date>2012-01-31</Date>
<Version>3.5.2</Version>
@@ -0,0 +1,65 @@
+--- bin/mudur.py.orig 2012-10-16 15:47:32.000000000 +0300
++++ bin/mudur.py 2012-10-16 15:48:56.086311247 +0300
+@@ -274,7 +274,7 @@
+
+ # Fill in the options
+ self.options["live"] = options.has_key("thin") or \
+- os.path.exists("/var/run/pardus/livemedia")
++ os.path.exists("/run/pardus/livemedia")
+
+ for k in [_k for _k in options.keys() if _k not in ("thin")]:
+ self.options[k] = options[k] if options[k] else True
+@@ -665,16 +665,16 @@
+ if not os.path.exists("/var/lib/dbus/machine-id"):
+ run("/usr/bin/dbus-uuidgen", "--ensure")
+ run("/sbin/start-stop-daemon", "-b", "--start", "--quiet",
+- "--pidfile", "/var/run/dbus/pid", "--exec", "/usr/bin/dbus-daemon",
++ "--pidfile", "/run/dbus/pid", "--exec", "/usr/bin/dbus-daemon",
+ "--", "--system")
+- wait_bus("/var/run/dbus/system_bus_socket")
++ wait_bus("/run/dbus/system_bus_socket")
+
+ @plymouth_update_milestone
+ def stop_dbus():
+ """Stops the D-Bus service."""
+ ui.info(_("Stopping %s") % "DBus")
+ run("/sbin/start-stop-daemon", "--stop", "--quiet",
+- "--pidfile", "/var/run/dbus/pid")
++ "--pidfile", "/run/dbus/pid")
+
+ #############################
+ # UDEV management functions #
+@@ -719,6 +719,8 @@
+ @plymouth_update_milestone
+ def start_udev():
+ """Prepares the startup of udev daemon and starts it."""
++ # /run must be mounted as tmpfs
++ run_quiet("/bin/mount", "-t", "tmpfs", "-o", "mode=755", "tmpfs", "/run")
+
+ # When these files are missing, lots of trouble happens
+ # so we double check their existence
+@@ -1026,7 +1028,7 @@
+ """Cleans up /var upon boot."""
+ ui.info(_("Cleaning up /var"))
+ blacklist = ["utmp", "random-seed", "livemedia"]
+- for root, dirs, files in os.walk("/var/run"):
++ for root, dirs, files in os.walk("/run"):
+ for _file in files:
+ if _file not in blacklist:
+ try:
+@@ -1280,12 +1282,12 @@
+ wait_for_udev_events()
+
+ # When we exit this runlevel, init will write a boot record to utmp
+- write_to_file("/var/run/utmp")
++ write_to_file("/run/utmp")
+ touch("/var/log/wtmp")
+
+- run("/bin/chgrp", "utmp", "/var/run/utmp", "/var/log/wtmp")
++ run("/bin/chgrp", "utmp", "/run/utmp", "/var/log/wtmp")
+
+- os.chmod("/var/run/utmp", 0664)
++ os.chmod("/run/utmp", 0664)
+ os.chmod("/var/log/wtmp", 0664)
+
+ ### BOOT ###
@@ -20,6 +20,7 @@
<!-- This causes unicode errors when mudur=safe, drop it (#16388) -->
<Patch level="1">fix-unicode-error-on-mudur-safe.patch</Patch>
+ <Patch>mount_run_as_tmpfs.patch</Patch>
</Patches>
</Source>
@@ -64,6 +65,16 @@
</Package>
<History>
+ <Update release="127">
+ <Date>2012-10-16</Date>
+ <Version>4.1.3</Version>
+ <Comment>
+ * /var/run -> /run
+ * Mount /run as tmpfs
+ </Comment>
+ <Name>Erdem Artan</Name>
+ <Email>erdem@pardus-linux.org</Email>
+ </Update>
<Update release="126">
<Date>2011-01-24</Date>
<Version>4.1.3</Version>

0 comments on commit aa54d42

Please sign in to comment.