Subversion Repositories livecd

Rev

Rev 402 | Rev 412 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 402 Rev 410
Line 294... Line 294...
294 
/usr/bin/cp /usr/lib/python2.7/site-packages/blivet/size.py /usr/lib/python2.7/site-packages/blivet/size.py.orig
 294 
/usr/bin/cp /usr/lib/python2.7/site-packages/blivet/size.py /usr/lib/python2.7/site-packages/blivet/size.py.orig
295 
/usr/bin/sed -i "s#return self.humanReadable()#return self.humanReadable().encode('utf-8')#g" /usr/lib/python2.7/site-packages/blivet/size.py
 295 
/usr/bin/sed -i "s#return self.humanReadable()#return self.humanReadable().encode('utf-8')#g" /usr/lib/python2.7/site-packages/blivet/size.py
296 
 
 296 
 
297 
EOF
 297 
EOF
298 
 
 298 
 
299 
# Patching livepayload too https://bugzilla.redhat.com/show_bug.cgi?id=1100504
 - 
 
300 
cat > /tmp/livepayload.patch <<EOF
 - 
 
301 
--- /usr/lib64/python2.7/site-packages/pyanaconda/packaging/livepayload.py.orig
 - 
 
302 
+++ /usr/lib64/python2.7/site-packages/pyanaconda/packaging/livepayload.py
 - 
 
303 
@@ -152,6 +152,13 @@
 - 
 
304 
             self.pct = 100
 - 
 
305 
         threadMgr.wait(THREAD_LIVE_PROGRESS)
 - 
 
306
- 
 
307 
+        # Live needs to create the rescue image before bootloader is written
 - 
 
308 
+        for kernel in self.kernelVersionList:
 - 
 
309 
+            log.info("Generating rescue image for %s", kernel)
 - 
 
310 
+            iutil.execInSysroot("new-kernel-pkg",
 - 
 
311 
+                                ["--rpmposttrans", kernel])
 - 
 
312 
+
 - 
 
313 
+
 - 
 
314 
     def postInstall(self):
 - 
 
315 
         """ Perform post-installation tasks. """
 - 
 
316 
         progressQ.send_message(_("Performing post-installation setup tasks"))
 - 
 
317 
@@ -159,12 +166,6 @@
 - 
 
318
- 
 
319 
         super(LiveImagePayload, self).postInstall()
 - 
 
320
- 
 
321 
-        # Live needs to create the rescue image before bootloader is written
 - 
 
322 
-        for kernel in self.kernelVersionList:
 - 
 
323 
-            log.info("Generating rescue image for %s", kernel)
 - 
 
324 
-            iutil.execInSysroot("new-kernel-pkg",
 - 
 
325 
-                                ["--rpmposttrans", kernel])
 - 
 
326 
-
 - 
 
327 
         # Make sure the new system has a machine-id, it won't boot without it
 - 
 
328 
         if not os.path.exists(iutil.getSysroot()+"/etc/machine-id"):
 - 
 
329 
             iutil.execInSysroot("systemd-machine-id-setup", [])
 - 
 
330 
 
 - 
 
331 
EOF
 - 
 
332 
 
 - 
 
333 
patch -p0 /usr/lib64/python2.7/site-packages/pyanaconda/packaging/livepayload.py /tmp/livepayload.patch
- 
 
334 
 
 - 
 
335 
# bah, hal starts way too late
 299 
# bah, hal starts way too late
336 
cat > /etc/rc.d/init.d/livesys-late << EOF
 300 
cat > /etc/rc.d/init.d/livesys-late << EOF
337 
#!/bin/bash
 301 
#!/bin/bash
338 
#
 302 
#
339 
# live: Late init script for live image
 303 
# live: Late init script for live image