Subversion Repositories livecd

Rev

Rev 397 | Rev 399 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 397 Rev 398
Line 11... Line 11...
11 
 
 11 
 
12 
 
 12 
 
13 
# Root password
 13 
# Root password
14 
rootpw --iscrypted $6$K2nKf02kVKG68960$OywvoaViphSITuro/liKvCj7Pm/CH/xqzz/lsoXyaKSR1lYf0vHAqSUc483a9MCCBkIwfr/hNMfqwxqVO0OEg1
 14 
rootpw --iscrypted $6$K2nKf02kVKG68960$OywvoaViphSITuro/liKvCj7Pm/CH/xqzz/lsoXyaKSR1lYf0vHAqSUc483a9MCCBkIwfr/hNMfqwxqVO0OEg1
15 
 
 15 
 
- 
 
 16 
# Workaround for the grubby issue on live media (see https://bugzilla.redhat.com/show_bug.cgi?id=1153410)
16 
# SL repositories (fastbugs enabled per default)
17 
# SL repositories (fastbugs enabled per default)
17 
repo --name=base      --baseurl=http://ftp.scientificlinux.org/linux/scientific/7rolling/$basearch/os/
 18 
repo --name=base      --baseurl=http://ftp.scientificlinux.org/linux/scientific/7rolling/$basearch/os/               --excludepkgs=grubby
18 
repo --name=security  --baseurl=http://ftp.scientificlinux.org/linux/scientific/7rolling/$basearch/updates/security/
 19 
repo --name=security  --baseurl=http://ftp.scientificlinux.org/linux/scientific/7rolling/$basearch/updates/security/ --excludepkgs=grubby
19 
repo --name=fastbugs  --baseurl=http://ftp.scientificlinux.org/linux/scientific/7rolling/$basearch/updates/fastbugs/
 20 
repo --name=fastbugs  --baseurl=http://ftp.scientificlinux.org/linux/scientific/7rolling/$basearch/updates/fastbugs/ --excludepkgs=grubby
- 
 
 21 
repo --name=grubby    --baseurl=http://ftp.scientificlinux.org/linux/scientific/70/$basearch/os/                     --includepkgs=grubby
20 
 
 22 
 
21 
# or use a mirror close to you
 23 
# or use a mirror close to you
22 
#repo --name=base      --baseurl=http://mirror.switch.ch/ftp/mirror/scientificlinux/7rolling/$basearch/os/
 24 
#repo --name=base      --baseurl=http://mirror.switch.ch/ftp/mirror/scientificlinux/7rolling/$basearch/os/               --excludepkgs=grubby
23 
#repo --name=security  --baseurl=http://mirror.switch.ch/ftp/mirror/scientificlinux/7rolling/$basearch/updates/security/
 25 
#repo --name=security  --baseurl=http://mirror.switch.ch/ftp/mirror/scientificlinux/7rolling/$basearch/updates/security/ --excludepkgs=grubby
24 
#repo --name=fastbugs  --baseurl=http://mirror.switch.ch/ftp/mirror/scientificlinux/7rolling/$basearch/updates/fastbugs/
 26 
#repo --name=fastbugs  --baseurl=http://mirror.switch.ch/ftp/mirror/scientificlinux/7rolling/$basearch/updates/fastbugs/ --excludepkgs=grubby
- 
 
 27 
#repo --name=grubby    --baseurl=http://ftp.scientificlinux.org/linux/scientific/70/$basearch/os/                        --includepkgs=grubby
25 
 
 28 
 
26 
 
 29 
 
27 
%packages
 30 
%packages
28 
abattis-cantarell-fonts
 31 
abattis-cantarell-fonts
29 
accountsservice
 32 
accountsservice
Line 144... Line 147...
144 
dnsmasq
 147 
dnsmasq
145 
dosfstools
 148 
dosfstools
146 
dracut
 149 
dracut
147 
dracut-config-rescue
 150 
dracut-config-rescue
148 
dracut-network
 151 
dracut-network
149 
dump
 - 
 
150 
dyninst
 152 
dyninst
151 
e2fsprogs
 153 
e2fsprogs
152 
e2fsprogs-libs
 154 
e2fsprogs-libs
153 
ebtables
 155 
ebtables
154 
ed
 156 
ed
Line 724... Line 726...
724 
pango
 726 
pango
725 
pangomm
 727 
pangomm
726 
paratype-pt-sans-fonts
 728 
paratype-pt-sans-fonts
727 
parted
 729 
parted
728 
passwd
 730 
passwd
- 
 
 731 
patch
729 
pciutils
 732 
pciutils
730 
pciutils-libs
 733 
pciutils-libs
731 
pcre
 734 
pcre
732 
pcsc-lite-libs
 735 
pcsc-lite-libs
733 
perl
 736 
perl
Line 1193... Line 1196...
1193 
/usr/bin/cp /usr/lib/python2.7/site-packages/blivet/size.py /usr/lib/python2.7/site-packages/blivet/size.py.orig
 1196 
/usr/bin/cp /usr/lib/python2.7/site-packages/blivet/size.py /usr/lib/python2.7/site-packages/blivet/size.py.orig
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
 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
1195 
 
 1198 
 
1196 
EOF
 1199 
EOF
1197 
 
 1200 
 
- 
 
 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 
 
1198 
# bah, hal starts way too late
 1237 
# bah, hal starts way too late
1199 
cat > /etc/rc.d/init.d/livesys-late << EOF
 1238 
cat > /etc/rc.d/init.d/livesys-late << EOF
1200 
#!/bin/bash
 1239 
#!/bin/bash
1201 
#
 1240 
#
1202 
# live: Late init script for live image
 1241 
# live: Late init script for live image
Line 1334... Line 1373...
1334 
 
 1373 
 
1335 
# make sure to set the right permissions and selinux contexts
 1374 
# make sure to set the right permissions and selinux contexts
1336 
chown -R liveuser:liveuser /home/liveuser/
 1375 
chown -R liveuser:liveuser /home/liveuser/
1337 
restorecon -R /home/liveuser/
 1376 
restorecon -R /home/liveuser/
1338 
 
 1377 
 
1339 
# Fixing default locale to us
 1378 
# Fixing default locale to us - does not work for SL7.1
1340 
#localectl set-keymap us
 1379 
#localectl set-keymap us
1341 
#localectl set-x11-keymap us
 1380 
#localectl set-x11-keymap us
1342 
EOF
 1381 
EOF
1343 
 
 1382 
 
1344 
# rebuild schema cache with any overrides we installed
 1383 
# rebuild schema cache with any overrides we installed