corporate2/devel/system/base/mkinitramfs - Merge from devel/system/base/mkinitramfs/

[Ozan Çağlayan]

Author: ozan.caglayan
Date: Mon Dec 21 09:44:52 2009
New Revision: 83252

Modified:
   corporate2/devel/system/base/mkinitramfs/   (props changed)
   corporate2/devel/system/base/mkinitramfs/files/init
   corporate2/devel/system/base/mkinitramfs/files/mkinitramfs
   corporate2/devel/system/base/mkinitramfs/pspec.xml
Log:
Merge from devel/system/base/mkinitramfs/:

rev. 82364, by onur on 2009-12-09
Use full path for modinfo in mkinitramfs, by Ozan

rev. 82365, by onur on 2009-12-09
touch livemedia for userspace

rev. 82366, by onur on 2009-12-09
Touch livemedia for userspace
Use full path for modinfo in mkinitramfs, by Ozan

---
 files/init        |    3 +++
 files/mkinitramfs |    2 +-
 pspec.xml         |   10 ++++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

Modified: corporate2/devel/system/base/mkinitramfs/files/init
=================================================================
--- corporate2/devel/system/base/mkinitramfs/files/init	(original)
+++ corporate2/devel/system/base/mkinitramfs/files/init	Mon Dec 21 09:44:52 2009
@@ -253,6 +253,9 @@
     chmod 1777 tmp
     (cd /newroot/${FS_LOCATION}; cp -a ${ROOT_TREES} /newroot)
 
+    # for userspace
+    touch /newroot/var/run/pardus/livemedia
+
     # this is needed for yali
     MNTDIR=`grep \/mnt\/cdrom\  /proc/mounts|sed 's/\/newroot//g'`
     echo "$MNTDIR" >> /newroot/etc/fstab

Modified: corporate2/devel/system/base/mkinitramfs/files/mkinitramfs
=================================================================
--- corporate2/devel/system/base/mkinitramfs/files/mkinitramfs	(original)
+++ corporate2/devel/system/base/mkinitramfs/files/mkinitramfs	Mon Dec 21 09:44:52 2009
@@ -244,7 +244,7 @@
         self.modulesList.extend([os.path.join(self.modulesDir, x) for x in deps if not x == ""])
 
     def appendFirmwares(self):
-        ret = capture("modinfo -F firmware %s/*.ko" % os.path.join(self.targetDir, self.modulesDir.replace(self.rootDir, "/").lstrip("/")))[0]
+        ret = capture("/sbin/modinfo -F firmware %s/*.ko" % os.path.join(self.targetDir, self.modulesDir.replace(self.rootDir, "/").lstrip("/")))[0]
         fwlist = ret.strip("\n").split("\n")
 
         targetbase = os.path.join(self.targetDir, "lib/firmware")

Modified: corporate2/devel/system/base/mkinitramfs/pspec.xml
=================================================================
--- corporate2/devel/system/base/mkinitramfs/pspec.xml	(original)
+++ corporate2/devel/system/base/mkinitramfs/pspec.xml	Mon Dec 21 09:44:52 2009
@@ -47,6 +47,16 @@
     </Package>
 
     <History>
+        <Update release="59">
+            <Date>2009-12-05</Date>
+            <Version>0.6</Version>
+            <Comment>
+                Touch livemedia for userspace
+                Use full path for modinfo in mkinitramfs, by Ozan
+            </Comment>
+            <Name>Onur Küçük</Name>
+            <Email>onur at pardus.org.tr</Email>
+        </Update>
         <Update release="58">
             <Date>2009-11-03</Date>
             <Version>0.6</Version>