Subversion Repositories livecd

Rev

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

Rev 397 Rev 400
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/7.0/$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/7.0/$basearch/os/                       --includepkgs=grubby
25 
 
 28 
 
26 
 
 29 
 
27 
%packages
 30 
%packages
28 
@base
 31 
@base
29 
@core
 32 
@core
Line 40... Line 43...
40 
@network-file-system-client
 43 
@network-file-system-client
41 
@print-client
 44 
@print-client
42 
@x11
 45 
@x11
43 
@internet-applications
 46 
@internet-applications
44 
@office-suite
 47 
@office-suite
- 
 
 48 
@remote-desktop-clients
45 
@gnome-apps
 49 
@gnome-apps
46 
 
 50 
 
47 
# additional packages
 51 
# additional packages
48 
@backup-client
 52 
@backup-client
49 
@compat-libraries
 53 
@compat-libraries
Line 94... Line 98...
94 
 
 98 
 
95 
# live install tools
 99 
# live install tools
96 
anaconda
 100 
anaconda
97 
system-config-keyboard
 101 
system-config-keyboard
98 
firefox
 102 
firefox
- 
 
 103 
patch
99 
 
 104 
 
100 
# for UEFI/Secureboot support
 105 
# for UEFI/Secureboot support
101 
grub2
 106 
grub2
102 
grub2-efi
 107 
grub2-efi
103 
efibootmgr
 108 
efibootmgr
Line 273... Line 278...
273 
/usr/bin/cp /usr/lib/python2.7/site-packages/blivet/size.py /usr/lib/python2.7/site-packages/blivet/size.py.orig
 278 
/usr/bin/cp /usr/lib/python2.7/site-packages/blivet/size.py /usr/lib/python2.7/site-packages/blivet/size.py.orig
274 
/usr/bin/sed -i "s#return self.humanReadable()#return self.humanReadable().encode('utf-8')#g" /usr/lib/python2.7/site-packages/blivet/size.py
 279 
/usr/bin/sed -i "s#return self.humanReadable()#return self.humanReadable().encode('utf-8')#g" /usr/lib/python2.7/site-packages/blivet/size.py
275 
 
 280 
 
276 
EOF
 281 
EOF
277 
 
 282 
 
- 
 
 283 
# Patching livepayload too https://bugzilla.redhat.com/show_bug.cgi?id=1100504
- 
 
 284 
cat > /tmp/livepayload.patch <<EOF
- 
 
 285 
--- /usr/lib64/python2.7/site-packages/pyanaconda/packaging/livepayload.py.orig
- 
 
 286 
+++ /usr/lib64/python2.7/site-packages/pyanaconda/packaging/livepayload.py
- 
 
 287 
@@ -152,6 +152,13 @@
- 
 
 288 
             self.pct = 100
- 
 
 289 
         threadMgr.wait(THREAD_LIVE_PROGRESS)
- 
 
 290
- 
 
 291 
+        # Live needs to create the rescue image before bootloader is written
- 
 
 292 
+        for kernel in self.kernelVersionList:
- 
 
 293 
+            log.info("Generating rescue image for %s", kernel)
- 
 
 294 
+            iutil.execInSysroot("new-kernel-pkg",
- 
 
 295 
+                                ["--rpmposttrans", kernel])
- 
 
 296 
+
- 
 
 297 
+
- 
 
 298 
     def postInstall(self):
- 
 
 299 
         """ Perform post-installation tasks. """
- 
 
 300 
         progressQ.send_message(_("Performing post-installation setup tasks"))
- 
 
 301 
@@ -159,12 +166,6 @@
- 
 
 302
- 
 
 303 
         super(LiveImagePayload, self).postInstall()
- 
 
 304
- 
 
 305 
-        # Live needs to create the rescue image before bootloader is written
- 
 
 306 
-        for kernel in self.kernelVersionList:
- 
 
 307 
-            log.info("Generating rescue image for %s", kernel)
- 
 
 308 
-            iutil.execInSysroot("new-kernel-pkg",
- 
 
 309 
-                                ["--rpmposttrans", kernel])
- 
 
 310 
-
- 
 
 311 
         # Make sure the new system has a machine-id, it won't boot without it
- 
 
 312 
         if not os.path.exists(iutil.getSysroot()+"/etc/machine-id"):
- 
 
 313 
             iutil.execInSysroot("systemd-machine-id-setup", [])
- 
 
 314 
 
- 
 
 315 
EOF
- 
 
 316 
 
- 
 
 317 
patch -p0 /usr/lib64/python2.7/site-packages/pyanaconda/packaging/livepayload.py /tmp/livepayload.patch
- 
 
 318 
 
278 
# bah, hal starts way too late
 319 
# bah, hal starts way too late
279 
cat > /etc/rc.d/init.d/livesys-late << EOF
 320 
cat > /etc/rc.d/init.d/livesys-late << EOF
280 
#!/bin/bash
 321 
#!/bin/bash
281 
#
 322 
#
282 
# live: Late init script for live image
 323 
# live: Late init script for live image
Line 414... Line 455...
414 
 
 455 
 
415 
# make sure to set the right permissions and selinux contexts
 456 
# make sure to set the right permissions and selinux contexts
416 
chown -R liveuser:liveuser /home/liveuser/
 457 
chown -R liveuser:liveuser /home/liveuser/
417 
restorecon -R /home/liveuser/
 458 
restorecon -R /home/liveuser/
418 
 
 459 
 
419 
# Fixing default locale to us
 460 
# Fixing default locale to us - does not work for SL7.1
420 
#localectl set-keymap us
 461 
#localectl set-keymap us
421 
#localectl set-x11-keymap us
 462 
#localectl set-x11-keymap us
422 
EOF
 463 
EOF
423 
 
 464 
 
424 
# rebuild schema cache with any overrides we installed
 465 
# rebuild schema cache with any overrides we installed