Subversion Repositories livecd

Rev

Rev 397 | Rev 401 | Go to most recent revision | Show entire file | Ignore 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 
# epel
 29 
# epel
27 
repo --name=epel      --baseurl=http://download.fedoraproject.org/pub/epel/7/$basearch
 30 
repo --name=epel      --baseurl=http://download.fedoraproject.org/pub/epel/7/$basearch
28 
 
 31 
 
- 
 
 32 
 
29 
%packages
 33 
%packages
30 
@base
 34 
@base
31 
@core
 35 
@core
32 
@dial-up
 36 
@dial-up
33 
@directory-client
 37 
@directory-client
Line 42... Line 46...
42 
@network-file-system-client
 46 
@network-file-system-client
43 
@print-client
 47 
@print-client
44 
@x11
 48 
@x11
45 
@internet-applications
 49 
@internet-applications
46 
@office-suite
 50 
@office-suite
- 
 
 51 
@remote-desktop-clients
47 
@gnome-apps
 52 
@gnome-apps
48 
 
 53 
 
49 
# additional packages
 54 
# additional packages
50 
@backup-client
 55 
@backup-client
51 
@compat-libraries
 56 
@compat-libraries
Line 96... Line 101...
96 
 
 101 
 
97 
# live install tools
 102 
# live install tools
98 
anaconda
 103 
anaconda
99 
system-config-keyboard
 104 
system-config-keyboard
100 
firefox
 105 
firefox
- 
 
 106 
patch
101 
 
 107 
 
102 
# for UEFI/Secureboot support
 108 
# for UEFI/Secureboot support
103 
grub2
 109 
grub2
104 
grub2-efi
 110 
grub2-efi
105 
efibootmgr
 111 
efibootmgr
Line 288... Line 294...
288 
/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
289 
/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
290 
 
 296 
 
291 
EOF
 297 
EOF
292 
 
 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 
 
293 
# bah, hal starts way too late
 335 
# bah, hal starts way too late
294 
cat > /etc/rc.d/init.d/livesys-late << EOF
 336 
cat > /etc/rc.d/init.d/livesys-late << EOF
295 
#!/bin/bash
 337 
#!/bin/bash
296 
#
 338 
#
297 
# live: Late init script for live image
 339 
# live: Late init script for live image
Line 429... Line 471...
429 
 
 471 
 
430 
# make sure to set the right permissions and selinux contexts
 472 
# make sure to set the right permissions and selinux contexts
431 
chown -R liveuser:liveuser /home/liveuser/
 473 
chown -R liveuser:liveuser /home/liveuser/
432 
restorecon -R /home/liveuser/
 474 
restorecon -R /home/liveuser/
433 
 
 475 
 
434 
# Fixing default locale to us
 476 
# Fixing default locale to us - does not work for SL7.1
435 
#localectl set-keymap us
 477 
#localectl set-keymap us
436 
#localectl set-x11-keymap us
 478 
#localectl set-x11-keymap us
437 
EOF
 479 
EOF
438 
 
 480 
 
439 
# rebuild schema cache with any overrides we installed
 481 
# rebuild schema cache with any overrides we installed