Subversion Repositories livecd

Rev

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

Rev 402 Rev 410
Line 203... Line 203...
203 
gd
 203 
gd
204 
gdbm
 204 
gdbm
205 
gdisk
 205 
gdisk
206 
gdk-pixbuf2
 206 
gdk-pixbuf2
207 
gdm
 207 
gdm
208 
gdm-libs
 - 
 
209 
gedit
 208 
gedit
210 
geoclue
 209 
geoclue
211 
gettext
 210 
gettext
212 
gettext-libs
 211 
gettext-libs
213 
ghostscript
 212 
ghostscript
Line 252... Line 251...
252 
gnome-python2-gnomevfs
 251 
gnome-python2-gnomevfs
253 
gnome-screenshot
 252 
gnome-screenshot
254 
gnome-session
 253 
gnome-session
255 
gnome-session-xsession
 254 
gnome-session-xsession
256 
gnome-settings-daemon
 255 
gnome-settings-daemon
257 
gnome-settings-daemon-updates
 - 
 
258 
gnome-shell
 256 
gnome-shell
259 
gnome-shell-extension-alternate-tab
 257 
gnome-shell-extension-alternate-tab
260 
gnome-shell-extension-apps-menu
 258 
gnome-shell-extension-apps-menu
261 
gnome-shell-extension-common
 259 
gnome-shell-extension-common
262 
gnome-shell-extension-launch-new-instance
 260 
gnome-shell-extension-launch-new-instance
Line 520... Line 518...
520 
libreport-filesystem
 518 
libreport-filesystem
521 
libreport-gtk
 519 
libreport-gtk
522 
libreport-plugin-bugzilla
 520 
libreport-plugin-bugzilla
523 
libreport-plugin-mailx
 521 
libreport-plugin-mailx
524 
libreport-plugin-reportuploader
 522 
libreport-plugin-reportuploader
525 
libreport-plugin-rhtsupport
 - 
 
526 
libreport-python
 523 
libreport-python
527 
libreport-rhel-anaconda-bugzilla
 524 
libreport-rhel-anaconda-bugzilla
528 
libreport-web
 525 
libreport-web
529 
libreswan
 526 
libreswan
530 
librsvg2
 527 
librsvg2
Line 1196... Line 1193...
1196 
/usr/bin/cp /usr/lib/python2.7/site-packages/blivet/size.py /usr/lib/python2.7/site-packages/blivet/size.py.orig
 1193 
/usr/bin/cp /usr/lib/python2.7/site-packages/blivet/size.py /usr/lib/python2.7/site-packages/blivet/size.py.orig
1197 
/usr/bin/sed -i "s#return self.humanReadable()#return self.humanReadable().encode('utf-8')#g" /usr/lib/python2.7/site-packages/blivet/size.py
 1194 
/usr/bin/sed -i "s#return self.humanReadable()#return self.humanReadable().encode('utf-8')#g" /usr/lib/python2.7/site-packages/blivet/size.py
1198 
 
 1195 
 
1199 
EOF
 1196 
EOF
1200 
 
 1197 
 
1201 
# Patching livepayload too https://bugzilla.redhat.com/show_bug.cgi?id=1100504
 - 
 
1202 
cat > /tmp/livepayload.patch <<EOF
 - 
 
1203 
--- /usr/lib64/python2.7/site-packages/pyanaconda/packaging/livepayload.py.orig
 - 
 
1204 
+++ /usr/lib64/python2.7/site-packages/pyanaconda/packaging/livepayload.py
 - 
 
1205 
@@ -152,6 +152,13 @@
 - 
 
1206 
             self.pct = 100
 - 
 
1207 
         threadMgr.wait(THREAD_LIVE_PROGRESS)
 - 
 
1208
- 
 
1209 
+        # Live needs to create the rescue image before bootloader is written
 - 
 
1210 
+        for kernel in self.kernelVersionList:
 - 
 
1211 
+            log.info("Generating rescue image for %s", kernel)
 - 
 
1212 
+            iutil.execInSysroot("new-kernel-pkg",
 - 
 
1213 
+                                ["--rpmposttrans", kernel])
 - 
 
1214 
+
 - 
 
1215 
+
 - 
 
1216 
     def postInstall(self):
 - 
 
1217 
         """ Perform post-installation tasks. """
 - 
 
1218 
         progressQ.send_message(_("Performing post-installation setup tasks"))
 - 
 
1219 
@@ -159,12 +166,6 @@
 - 
 
1220
- 
 
1221 
         super(LiveImagePayload, self).postInstall()
 - 
 
1222
- 
 
1223 
-        # Live needs to create the rescue image before bootloader is written
 - 
 
1224 
-        for kernel in self.kernelVersionList:
 - 
 
1225 
-            log.info("Generating rescue image for %s", kernel)
 - 
 
1226 
-            iutil.execInSysroot("new-kernel-pkg",
 - 
 
1227 
-                                ["--rpmposttrans", kernel])
 - 
 
1228 
-
 - 
 
1229 
         # Make sure the new system has a machine-id, it won't boot without it
 - 
 
1230 
         if not os.path.exists(iutil.getSysroot()+"/etc/machine-id"):
 - 
 
1231 
             iutil.execInSysroot("systemd-machine-id-setup", [])
 - 
 
1232 
 
 - 
 
1233 
EOF
 - 
 
1234 
 
 - 
 
1235 
patch -p0 /usr/lib64/python2.7/site-packages/pyanaconda/packaging/livepayload.py /tmp/livepayload.patch
- 
 
1236 
 
 - 
 
1237 
# bah, hal starts way too late
 1198 
# bah, hal starts way too late
1238 
cat > /etc/rc.d/init.d/livesys-late << EOF
 1199 
cat > /etc/rc.d/init.d/livesys-late << EOF
1239 
#!/bin/bash
 1200 
#!/bin/bash
1240 
#
 1201 
#
1241 
# live: Late init script for live image
 1202 
# live: Late init script for live image