Subversion Repositories livecd

Rev

Rev 401 | Rev 410 | Go to most recent revision | Only display areas with differences | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 401 Rev 402
1
 
1
 
2
lang en_GB.UTF-8
2
lang en_GB.UTF-8
3
keyboard us
3
keyboard us
4
timezone Europe/Brussels --isUtc
4
timezone Europe/Brussels --isUtc
5
auth --useshadow --enablemd5
5
auth --useshadow --enablemd5
6
selinux --enforcing
6
selinux --enforcing
7
firewall --enabled --service=mdns
7
firewall --enabled --service=mdns
8
xconfig --startxonboot
8
xconfig --startxonboot
9
part / --size 8192 --fstype ext4
9
part / --size 8192 --fstype ext4
10
services --enabled=NetworkManager --disabled=network,sshd
10
services --enabled=NetworkManager --disabled=network,sshd
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
# Workaround for the grubby issue on live media (see https://bugzilla.redhat.com/show_bug.cgi?id=1153410)
17
# SL repositories (fastbugs enabled per default) 
17
# SL repositories (fastbugs enabled per default) 
18
repo --name=base      --baseurl=http://ftp.scientificlinux.org/linux/scientific/7rolling/$basearch/os/               --excludepkgs=grubby
18
repo --name=base      --baseurl=http://ftp.scientificlinux.org/linux/scientific/7rolling/$basearch/os/               --excludepkgs=grubby
19
repo --name=security  --baseurl=http://ftp.scientificlinux.org/linux/scientific/7rolling/$basearch/updates/security/ --excludepkgs=grubby
19
repo --name=security  --baseurl=http://ftp.scientificlinux.org/linux/scientific/7rolling/$basearch/updates/security/ --excludepkgs=grubby
20
repo --name=fastbugs  --baseurl=http://ftp.scientificlinux.org/linux/scientific/7rolling/$basearch/updates/fastbugs/ --excludepkgs=grubby
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
21
repo --name=grubby    --baseurl=http://ftp.scientificlinux.org/linux/scientific/7.0/$basearch/os/                    --includepkgs=grubby
22
 
22
 
23
# or use a mirror close to you
23
# or use a mirror close to you
24
#repo --name=base      --baseurl=http://mirror.switch.ch/ftp/mirror/scientificlinux/7rolling/$basearch/os/               --excludepkgs=grubby
24
#repo --name=base      --baseurl=http://mirror.switch.ch/ftp/mirror/scientificlinux/7rolling/$basearch/os/               --excludepkgs=grubby
25
#repo --name=security  --baseurl=http://mirror.switch.ch/ftp/mirror/scientificlinux/7rolling/$basearch/updates/security/ --excludepkgs=grubby
25
#repo --name=security  --baseurl=http://mirror.switch.ch/ftp/mirror/scientificlinux/7rolling/$basearch/updates/security/ --excludepkgs=grubby
26
#repo --name=fastbugs  --baseurl=http://mirror.switch.ch/ftp/mirror/scientificlinux/7rolling/$basearch/updates/fastbugs/ --excludepkgs=grubby
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
27
#repo --name=grubby    --baseurl=http://ftp.scientificlinux.org/linux/scientific/7.0/$basearch/os/                       --includepkgs=grubby
28
 
28
 
29
 
29
 
30
%packages
30
%packages
31
@base
31
@base
32
@core
32
@core
33
@dial-up
33
@dial-up
34
@directory-client
34
@directory-client
35
@fonts
35
@fonts
36
@kde-desktop
36
@kde-desktop
37
@guest-agents
37
@guest-agents
38
@guest-desktop-agents
38
@guest-desktop-agents
39
@input-methods
39
@input-methods
40
@internet-browser
40
@internet-browser
41
@java-platform
41
@java-platform
42
@multimedia
42
@multimedia
43
@network-file-system-client
43
@network-file-system-client
44
@print-client
44
@print-client
45
@x11
45
@x11
46
@internet-applications
46
@internet-applications
47
@office-suite
47
@office-suite
48
@remote-desktop-clients
48
#@remote-desktop-clients
49
@kde-apps
49
@kde-apps
50
@kde-media
50
@kde-media
51
 
51
 
52
# additional packages
52
# additional packages
53
@backup-client
53
@backup-client
54
@compat-libraries
54
@compat-libraries
55
@development
55
@development
56
@emacs
56
@emacs
57
@graphics
57
@graphics
58
@legacy-x
58
@legacy-x
59
@network-tools
59
@network-tools
60
@performance
60
@performance
61
@perl-runtime
61
@perl-runtime
62
@php
62
@php
63
@technical-writing
63
@technical-writing
64
 
64
 
65
# console-internet
65
# console-internet
66
lftp
66
lftp
67
mutt
67
mutt
68
whois
68
whois
69
 
69
 
70
# legacy-unix
70
# legacy-unix
71
finger
71
finger
72
ksh
72
ksh
73
telnet
73
telnet
74
 
74
 
75
# network-tools
75
# network-tools
76
nmap
76
nmap
77
wireshark
77
wireshark
78
iptraf-ng
78
iptraf-ng
79
netsniff-ng
79
netsniff-ng
80
 
80
 
81
# scientific
81
# scientific
82
atlas
82
atlas
83
fftw
83
fftw
84
gnuplot
84
gnuplot
85
lapack
85
lapack
86
numpy
86
numpy
87
scipy
87
scipy
88
units
88
units
89
 
89
 
90
# system-admin-tools
90
# system-admin-tools
91
screen
91
screen
92
system-storage-manager
92
system-storage-manager
93
tree
93
tree
94
mc
94
mc
95
 
95
 
96
# development
96
# development
97
java-1.7.0-openjdk-devel
97
java-1.7.0-openjdk-devel
98
 
98
 
99
# live install tools
99
# live install tools
100
anaconda
100
anaconda
101
system-config-keyboard
101
system-config-keyboard
102
firefox
102
firefox
103
patch
103
patch
104
 
104
 
105
# for UEFI/Secureboot support
105
# for UEFI/Secureboot support
106
grub2
106
grub2
107
grub2-efi
107
grub2-efi
108
efibootmgr
108
efibootmgr
109
shim
109
shim
110
 
110
 
111
%end
111
%end
112
 
112
 
113
%post
113
%post
114
# FIXME: it'd be better to get this installed from a package
114
# FIXME: it'd be better to get this installed from a package
115
cat > /etc/rc.d/init.d/livesys << EOF
115
cat > /etc/rc.d/init.d/livesys << EOF
116
#!/bin/bash
116
#!/bin/bash
117
#
117
#
118
# live: Init script for live image
118
# live: Init script for live image
119
#
119
#
120
# chkconfig: 345 00 99
120
# chkconfig: 345 00 99
121
# description: Init script for live image.
121
# description: Init script for live image.
122
### BEGIN INIT INFO
122
### BEGIN INIT INFO
123
# X-Start-Before: display-manager
123
# X-Start-Before: display-manager
124
### END INIT INFO
124
### END INIT INFO
125
 
125
 
126
. /etc/init.d/functions
126
. /etc/init.d/functions
127
 
127
 
128
if ! strstr "\`cat /proc/cmdline\`" rd.live.image || [ "\$1" != "start" ]; then
128
if ! strstr "\`cat /proc/cmdline\`" rd.live.image || [ "\$1" != "start" ]; then
129
    exit 0
129
    exit 0
130
fi
130
fi
131
 
131
 
132
if [ -e /.liveimg-configured ] ; then
132
if [ -e /.liveimg-configured ] ; then
133
    configdone=1
133
    configdone=1
134
fi
134
fi
135
 
135
 
136
exists() {
136
exists() {
137
    which \$1 >/dev/null 2>&1 || return
137
    which \$1 >/dev/null 2>&1 || return
138
    \$*
138
    \$*
139
}
139
}
140
 
140
 
141
# Make sure we don't mangle the hardware clock on shutdown
141
# Make sure we don't mangle the hardware clock on shutdown
142
ln -sf /dev/null /etc/systemd/system/hwclock-save.service
142
ln -sf /dev/null /etc/systemd/system/hwclock-save.service
143
 
143
 
144
livedir="LiveOS"
144
livedir="LiveOS"
145
for arg in \`cat /proc/cmdline\` ; do
145
for arg in \`cat /proc/cmdline\` ; do
146
  if [ "\${arg##rd.live.dir=}" != "\${arg}" ]; then
146
  if [ "\${arg##rd.live.dir=}" != "\${arg}" ]; then
147
    livedir=\${arg##rd.live.dir=}
147
    livedir=\${arg##rd.live.dir=}
148
    return
148
    return
149
  fi
149
  fi
150
  if [ "\${arg##live_dir=}" != "\${arg}" ]; then
150
  if [ "\${arg##live_dir=}" != "\${arg}" ]; then
151
    livedir=\${arg##live_dir=}
151
    livedir=\${arg##live_dir=}
152
    return
152
    return
153
  fi
153
  fi
154
done
154
done
155
 
155
 
156
# enable swaps unless requested otherwise
156
# enable swaps unless requested otherwise
157
swaps=\`blkid -t TYPE=swap -o device\`
157
swaps=\`blkid -t TYPE=swap -o device\`
158
if ! strstr "\`cat /proc/cmdline\`" noswap && [ -n "\$swaps" ] ; then
158
if ! strstr "\`cat /proc/cmdline\`" noswap && [ -n "\$swaps" ] ; then
159
  for s in \$swaps ; do
159
  for s in \$swaps ; do
160
    action "Enabling swap partition \$s" swapon \$s
160
    action "Enabling swap partition \$s" swapon \$s
161
  done
161
  done
162
fi
162
fi
163
if ! strstr "\`cat /proc/cmdline\`" noswap && [ -f /run/initramfs/live/\${livedir}/swap.img ] ; then
163
if ! strstr "\`cat /proc/cmdline\`" noswap && [ -f /run/initramfs/live/\${livedir}/swap.img ] ; then
164
  action "Enabling swap file" swapon /run/initramfs/live/\${livedir}/swap.img
164
  action "Enabling swap file" swapon /run/initramfs/live/\${livedir}/swap.img
165
fi
165
fi
166
 
166
 
167
mountPersistentHome() {
167
mountPersistentHome() {
168
  # support label/uuid
168
  # support label/uuid
169
  if [ "\${homedev##LABEL=}" != "\${homedev}" -o "\${homedev##UUID=}" != "\${homedev}" ]; then
169
  if [ "\${homedev##LABEL=}" != "\${homedev}" -o "\${homedev##UUID=}" != "\${homedev}" ]; then
170
    homedev=\`/sbin/blkid -o device -t "\$homedev"\`
170
    homedev=\`/sbin/blkid -o device -t "\$homedev"\`
171
  fi
171
  fi
172
 
172
 
173
  # if we're given a file rather than a blockdev, loopback it
173
  # if we're given a file rather than a blockdev, loopback it
174
  if [ "\${homedev##mtd}" != "\${homedev}" ]; then
174
  if [ "\${homedev##mtd}" != "\${homedev}" ]; then
175
    # mtd devs don't have a block device but get magic-mounted with -t jffs2
175
    # mtd devs don't have a block device but get magic-mounted with -t jffs2
176
    mountopts="-t jffs2"
176
    mountopts="-t jffs2"
177
  elif [ ! -b "\$homedev" ]; then
177
  elif [ ! -b "\$homedev" ]; then
178
    loopdev=\`losetup -f\`
178
    loopdev=\`losetup -f\`
179
    if [ "\${homedev##/run/initramfs/live}" != "\${homedev}" ]; then
179
    if [ "\${homedev##/run/initramfs/live}" != "\${homedev}" ]; then
180
      action "Remounting live store r/w" mount -o remount,rw /run/initramfs/live
180
      action "Remounting live store r/w" mount -o remount,rw /run/initramfs/live
181
    fi
181
    fi
182
    losetup \$loopdev \$homedev
182
    losetup \$loopdev \$homedev
183
    homedev=\$loopdev
183
    homedev=\$loopdev
184
  fi
184
  fi
185
 
185
 
186
  # if it's encrypted, we need to unlock it
186
  # if it's encrypted, we need to unlock it
187
  if [ "\$(/sbin/blkid -s TYPE -o value \$homedev 2>/dev/null)" = "crypto_LUKS" ]; then
187
  if [ "\$(/sbin/blkid -s TYPE -o value \$homedev 2>/dev/null)" = "crypto_LUKS" ]; then
188
    echo
188
    echo
189
    echo "Setting up encrypted /home device"
189
    echo "Setting up encrypted /home device"
190
    plymouth ask-for-password --command="cryptsetup luksOpen \$homedev EncHome"
190
    plymouth ask-for-password --command="cryptsetup luksOpen \$homedev EncHome"
191
    homedev=/dev/mapper/EncHome
191
    homedev=/dev/mapper/EncHome
192
  fi
192
  fi
193
 
193
 
194
  # and finally do the mount
194
  # and finally do the mount
195
  mount \$mountopts \$homedev /home
195
  mount \$mountopts \$homedev /home
196
  # if we have /home under what's passed for persistent home, then
196
  # if we have /home under what's passed for persistent home, then
197
  # we should make that the real /home.  useful for mtd device on olpc
197
  # we should make that the real /home.  useful for mtd device on olpc
198
  if [ -d /home/home ]; then mount --bind /home/home /home ; fi
198
  if [ -d /home/home ]; then mount --bind /home/home /home ; fi
199
  [ -x /sbin/restorecon ] && /sbin/restorecon /home
199
  [ -x /sbin/restorecon ] && /sbin/restorecon /home
200
  if [ -d /home/liveuser ]; then USERADDARGS="-M" ; fi
200
  if [ -d /home/liveuser ]; then USERADDARGS="-M" ; fi
201
}
201
}
202
 
202
 
203
findPersistentHome() {
203
findPersistentHome() {
204
  for arg in \`cat /proc/cmdline\` ; do
204
  for arg in \`cat /proc/cmdline\` ; do
205
    if [ "\${arg##persistenthome=}" != "\${arg}" ]; then
205
    if [ "\${arg##persistenthome=}" != "\${arg}" ]; then
206
      homedev=\${arg##persistenthome=}
206
      homedev=\${arg##persistenthome=}
207
      return
207
      return
208
    fi
208
    fi
209
  done
209
  done
210
}
210
}
211
 
211
 
212
if strstr "\`cat /proc/cmdline\`" persistenthome= ; then
212
if strstr "\`cat /proc/cmdline\`" persistenthome= ; then
213
  findPersistentHome
213
  findPersistentHome
214
elif [ -e /run/initramfs/live/\${livedir}/home.img ]; then
214
elif [ -e /run/initramfs/live/\${livedir}/home.img ]; then
215
  homedev=/run/initramfs/live/\${livedir}/home.img
215
  homedev=/run/initramfs/live/\${livedir}/home.img
216
fi
216
fi
217
 
217
 
218
# if we have a persistent /home, then we want to go ahead and mount it
218
# if we have a persistent /home, then we want to go ahead and mount it
219
if ! strstr "\`cat /proc/cmdline\`" nopersistenthome && [ -n "\$homedev" ] ; then
219
if ! strstr "\`cat /proc/cmdline\`" nopersistenthome && [ -n "\$homedev" ] ; then
220
  action "Mounting persistent /home" mountPersistentHome
220
  action "Mounting persistent /home" mountPersistentHome
221
fi
221
fi
222
 
222
 
223
# make it so that we don't do writing to the overlay for things which
223
# make it so that we don't do writing to the overlay for things which
224
# are just tmpdirs/caches
224
# are just tmpdirs/caches
225
mount -t tmpfs -o mode=0755 varcacheyum /var/cache/yum
225
mount -t tmpfs -o mode=0755 varcacheyum /var/cache/yum
226
mount -t tmpfs vartmp /var/tmp
226
mount -t tmpfs vartmp /var/tmp
227
[ -x /sbin/restorecon ] && /sbin/restorecon /var/cache/yum /var/tmp >/dev/null 2>&1
227
[ -x /sbin/restorecon ] && /sbin/restorecon /var/cache/yum /var/tmp >/dev/null 2>&1
228
 
228
 
229
if [ -n "\$configdone" ]; then
229
if [ -n "\$configdone" ]; then
230
  exit 0
230
  exit 0
231
fi
231
fi
232
 
232
 
233
# add live user with no passwd
233
# add live user with no passwd
234
action "Adding live user" useradd \$USERADDARGS -c "Live System User" liveuser
234
action "Adding live user" useradd \$USERADDARGS -c "Live System User" liveuser
235
passwd -d liveuser > /dev/null
235
passwd -d liveuser > /dev/null
236
usermod -aG wheel liveuser > /dev/null
236
usermod -aG wheel liveuser > /dev/null
237
 
237
 
238
# Remove root password lock
238
# Remove root password lock
239
passwd -d root > /dev/null
239
passwd -d root > /dev/null
240
 
240
 
241
# turn off firstboot for livecd boots
241
# turn off firstboot for livecd boots
242
systemctl --no-reload disable firstboot-text.service 2> /dev/null || :
242
systemctl --no-reload disable firstboot-text.service 2> /dev/null || :
243
systemctl --no-reload disable firstboot-graphical.service 2> /dev/null || :
243
systemctl --no-reload disable firstboot-graphical.service 2> /dev/null || :
244
systemctl stop firstboot-text.service 2> /dev/null || :
244
systemctl stop firstboot-text.service 2> /dev/null || :
245
systemctl stop firstboot-graphical.service 2> /dev/null || :
245
systemctl stop firstboot-graphical.service 2> /dev/null || :
246
 
246
 
247
# don't use prelink on a running live image
247
# don't use prelink on a running live image
248
sed -i 's/PRELINKING=yes/PRELINKING=no/' /etc/sysconfig/prelink &>/dev/null || :
248
sed -i 's/PRELINKING=yes/PRELINKING=no/' /etc/sysconfig/prelink &>/dev/null || :
249
 
249
 
250
# turn off mdmonitor by default
250
# turn off mdmonitor by default
251
systemctl --no-reload disable mdmonitor.service 2> /dev/null || :
251
systemctl --no-reload disable mdmonitor.service 2> /dev/null || :
252
systemctl --no-reload disable mdmonitor-takeover.service 2> /dev/null || :
252
systemctl --no-reload disable mdmonitor-takeover.service 2> /dev/null || :
253
systemctl stop mdmonitor.service 2> /dev/null || :
253
systemctl stop mdmonitor.service 2> /dev/null || :
254
systemctl stop mdmonitor-takeover.service 2> /dev/null || :
254
systemctl stop mdmonitor-takeover.service 2> /dev/null || :
255
 
255
 
256
# don't enable the gnome-settings-daemon packagekit plugin
256
# don't enable the gnome-settings-daemon packagekit plugin
257
echo -e "\ngsettings set org.gnome.settings-daemon.plugins.updates active 'false' &/dev/null || :" >> /home/liveuser/.bashrc
257
echo -e "\ngsettings set org.gnome.settings-daemon.plugins.updates active 'false' &>/dev/null || :" >> /home/liveuser/.bashrc
258
 
258
 
259
# don't start cron/at as they tend to spawn things which are
259
# don't start cron/at as they tend to spawn things which are
260
# disk intensive that are painful on a live image
260
# disk intensive that are painful on a live image
261
systemctl --no-reload disable crond.service 2> /dev/null || :
261
systemctl --no-reload disable crond.service 2> /dev/null || :
262
systemctl --no-reload disable atd.service 2> /dev/null || :
262
systemctl --no-reload disable atd.service 2> /dev/null || :
263
systemctl stop crond.service 2> /dev/null || :
263
systemctl stop crond.service 2> /dev/null || :
264
systemctl stop atd.service 2> /dev/null || :
264
systemctl stop atd.service 2> /dev/null || :
265
 
265
 
266
# disable kdump service
266
# disable kdump service
267
systemctl --no-reload disable kdump.service 2> /dev/null || :
267
systemctl --no-reload disable kdump.service 2> /dev/null || :
268
systemctl stop kdump.service 2> /dev/null || :
268
systemctl stop kdump.service 2> /dev/null || :
269
 
269
 
270
# Mark things as configured
270
# Mark things as configured
271
touch /.liveimg-configured
271
touch /.liveimg-configured
272
 
272
 
273
# add static hostname to work around xauth bug
273
# add static hostname to work around xauth bug
274
# https://bugzilla.redhat.com/show_bug.cgi?id=679486
274
# https://bugzilla.redhat.com/show_bug.cgi?id=679486
275
echo "localhost" > /etc/hostname
275
echo "localhost" > /etc/hostname
276
 
276
 
277
# Fixing the lang install issue when other lang than English is selected . See http://bugs.centos.org/view.php?id=7217
277
# Fixing the lang install issue when other lang than English is selected . See http://bugs.centos.org/view.php?id=7217
278
/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
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
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
280
 
280
 
281
EOF
281
EOF
282
 
282
 
283
# Patching livepayload too https://bugzilla.redhat.com/show_bug.cgi?id=1100504
283
# Patching livepayload too https://bugzilla.redhat.com/show_bug.cgi?id=1100504
284
cat > /tmp/livepayload.patch <<EOF
284
cat > /tmp/livepayload.patch <<EOF
285
--- /usr/lib64/python2.7/site-packages/pyanaconda/packaging/livepayload.py.orig
285
--- /usr/lib64/python2.7/site-packages/pyanaconda/packaging/livepayload.py.orig
286
+++ /usr/lib64/python2.7/site-packages/pyanaconda/packaging/livepayload.py
286
+++ /usr/lib64/python2.7/site-packages/pyanaconda/packaging/livepayload.py
287
@@ -152,6 +152,13 @@
287
@@ -152,6 +152,13 @@
288
             self.pct = 100
288
             self.pct = 100
289
         threadMgr.wait(THREAD_LIVE_PROGRESS)
289
         threadMgr.wait(THREAD_LIVE_PROGRESS)
290
 
290
 
291
+        # Live needs to create the rescue image before bootloader is written
291
+        # Live needs to create the rescue image before bootloader is written
292
+        for kernel in self.kernelVersionList:
292
+        for kernel in self.kernelVersionList:
293
+            log.info("Generating rescue image for %s", kernel)
293
+            log.info("Generating rescue image for %s", kernel)
294
+            iutil.execInSysroot("new-kernel-pkg",
294
+            iutil.execInSysroot("new-kernel-pkg",
295
+                                ["--rpmposttrans", kernel])
295
+                                ["--rpmposttrans", kernel])
296
+
296
+
297
+
297
+
298
     def postInstall(self):
298
     def postInstall(self):
299
         """ Perform post-installation tasks. """
299
         """ Perform post-installation tasks. """
300
         progressQ.send_message(_("Performing post-installation setup tasks"))
300
         progressQ.send_message(_("Performing post-installation setup tasks"))
301
@@ -159,12 +166,6 @@
301
@@ -159,12 +166,6 @@
302
 
302
 
303
         super(LiveImagePayload, self).postInstall()
303
         super(LiveImagePayload, self).postInstall()
304
 
304
 
305
-        # Live needs to create the rescue image before bootloader is written
305
-        # Live needs to create the rescue image before bootloader is written
306
-        for kernel in self.kernelVersionList:
306
-        for kernel in self.kernelVersionList:
307
-            log.info("Generating rescue image for %s", kernel)
307
-            log.info("Generating rescue image for %s", kernel)
308
-            iutil.execInSysroot("new-kernel-pkg",
308
-            iutil.execInSysroot("new-kernel-pkg",
309
-                                ["--rpmposttrans", kernel])
309
-                                ["--rpmposttrans", kernel])
310
-
310
-
311
         # Make sure the new system has a machine-id, it won't boot without it
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"):
312
         if not os.path.exists(iutil.getSysroot()+"/etc/machine-id"):
313
             iutil.execInSysroot("systemd-machine-id-setup", [])
313
             iutil.execInSysroot("systemd-machine-id-setup", [])
314
 
314
 
315
EOF
315
EOF
316
 
316
 
317
patch -p0 /usr/lib64/python2.7/site-packages/pyanaconda/packaging/livepayload.py /tmp/livepayload.patch 
317
patch -p0 /usr/lib64/python2.7/site-packages/pyanaconda/packaging/livepayload.py /tmp/livepayload.patch 
318
 
318
 
319
# bah, hal starts way too late
319
# bah, hal starts way too late
320
cat > /etc/rc.d/init.d/livesys-late << EOF
320
cat > /etc/rc.d/init.d/livesys-late << EOF
321
#!/bin/bash
321
#!/bin/bash
322
#
322
#
323
# live: Late init script for live image
323
# live: Late init script for live image
324
#
324
#
325
# chkconfig: 345 99 01
325
# chkconfig: 345 99 01
326
# description: Late init script for live image.
326
# description: Late init script for live image.
327
 
327
 
328
. /etc/init.d/functions
328
. /etc/init.d/functions
329
 
329
 
330
if ! strstr "\`cat /proc/cmdline\`" rd.live.image || [ "\$1" != "start" ] || [ -e /.liveimg-late-configured ] ; then
330
if ! strstr "\`cat /proc/cmdline\`" rd.live.image || [ "\$1" != "start" ] || [ -e /.liveimg-late-configured ] ; then
331
    exit 0
331
    exit 0
332
fi
332
fi
333
 
333
 
334
exists() {
334
exists() {
335
    which \$1 >/dev/null 2>&1 || return
335
    which \$1 >/dev/null 2>&1 || return
336
    \$*
336
    \$*
337
}
337
}
338
 
338
 
339
touch /.liveimg-late-configured
339
touch /.liveimg-late-configured
340
 
340
 
341
# read some variables out of /proc/cmdline
341
# read some variables out of /proc/cmdline
342
for o in \`cat /proc/cmdline\` ; do
342
for o in \`cat /proc/cmdline\` ; do
343
    case \$o in
343
    case \$o in
344
    ks=*)
344
    ks=*)
345
        ks="--kickstart=\${o#ks=}"
345
        ks="--kickstart=\${o#ks=}"
346
        ;;
346
        ;;
347
    xdriver=*)
347
    xdriver=*)
348
        xdriver="\${o#xdriver=}"
348
        xdriver="\${o#xdriver=}"
349
        ;;
349
        ;;
350
    esac
350
    esac
351
done
351
done
352
 
352
 
353
# if liveinst or textinst is given, start anaconda
353
# if liveinst or textinst is given, start anaconda
354
if strstr "\`cat /proc/cmdline\`" liveinst ; then
354
if strstr "\`cat /proc/cmdline\`" liveinst ; then
355
   plymouth --quit
355
   plymouth --quit
356
   /usr/sbin/liveinst \$ks
356
   /usr/sbin/liveinst \$ks
357
fi
357
fi
358
if strstr "\`cat /proc/cmdline\`" textinst ; then
358
if strstr "\`cat /proc/cmdline\`" textinst ; then
359
   plymouth --quit
359
   plymouth --quit
360
   /usr/sbin/liveinst --text \$ks
360
   /usr/sbin/liveinst --text \$ks
361
fi
361
fi
362
 
362
 
363
# configure X, allowing user to override xdriver
363
# configure X, allowing user to override xdriver
364
if [ -n "\$xdriver" ]; then
364
if [ -n "\$xdriver" ]; then
365
   cat > /etc/X11/xorg.conf.d/00-xdriver.conf <<FOE
365
   cat > /etc/X11/xorg.conf.d/00-xdriver.conf <<FOE
366
Section "Device"
366
Section "Device"
367
	Identifier	"Videocard0"
367
	Identifier	"Videocard0"
368
	Driver	"\$xdriver"
368
	Driver	"\$xdriver"
369
EndSection
369
EndSection
370
FOE
370
FOE
371
fi
371
fi
372
 
372
 
373
EOF
373
EOF
374
 
374
 
375
chmod 755 /etc/rc.d/init.d/livesys
375
chmod 755 /etc/rc.d/init.d/livesys
376
/sbin/restorecon /etc/rc.d/init.d/livesys
376
/sbin/restorecon /etc/rc.d/init.d/livesys
377
/sbin/chkconfig --add livesys
377
/sbin/chkconfig --add livesys
378
 
378
 
379
chmod 755 /etc/rc.d/init.d/livesys-late
379
chmod 755 /etc/rc.d/init.d/livesys-late
380
/sbin/restorecon /etc/rc.d/init.d/livesys-late
380
/sbin/restorecon /etc/rc.d/init.d/livesys-late
381
/sbin/chkconfig --add livesys-late
381
/sbin/chkconfig --add livesys-late
382
 
382
 
383
# enable tmpfs for /tmp
383
# enable tmpfs for /tmp
384
systemctl enable tmp.mount
384
systemctl enable tmp.mount
385
 
385
 
386
# work around for poor key import UI in PackageKit
386
# work around for poor key import UI in PackageKit
387
rm -f /var/lib/rpm/__db*
387
rm -f /var/lib/rpm/__db*
388
releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release)
388
releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release)
389
basearch=$(uname -i)
389
basearch=$(uname -i)
390
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-*
390
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-*
391
echo "Packages within this LiveCD (with version)"
391
echo "Packages within this LiveCD (with version)"
392
rpm -qa | sort
392
rpm -qa | sort
393
echo "Packages within this LiveCD"
393
echo "Packages within this LiveCD"
394
rpm -qa --qf "%{name}\n" | sort
394
rpm -qa --qf "%{name}\n" | sort
395
# Note that running rpm recreates the rpm db files which aren't needed or wanted
395
# Note that running rpm recreates the rpm db files which aren't needed or wanted
396
rm -f /var/lib/rpm/__db*
396
rm -f /var/lib/rpm/__db*
397
 
397
 
398
# go ahead and pre-make the man -k cache (#455968)
398
# go ahead and pre-make the man -k cache (#455968)
399
/usr/bin/mandb
399
/usr/bin/mandb
400
 
400
 
401
# save a little bit of space at least...
401
# save a little bit of space at least...
402
rm -f /boot/initramfs*
402
rm -f /boot/initramfs*
403
# make sure there aren't core files lying around
403
# make sure there aren't core files lying around
404
rm -f /core*
404
rm -f /core*
405
 
405
 
406
# convince readahead not to collect
406
# convince readahead not to collect
407
# FIXME: for systemd
407
# FIXME: for systemd
408
 
408
 
409
cat >> /etc/rc.d/init.d/livesys << EOF
409
cat >> /etc/rc.d/init.d/livesys << EOF
410
 
410
 
411
 
411
 
412
# disable updates plugin
412
# disable updates plugin
413
cat >> /usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.override << FOE
413
cat >> /usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.override << FOE
414
[org.gnome.settings-daemon.plugins.updates]
414
[org.gnome.settings-daemon.plugins.updates]
415
active=false
415
active=false
416
FOE
416
FOE
417
 
417
 
418
# Show the system-config-keyboard tool on the desktop
418
# Show the system-config-keyboard tool on the desktop
419
mkdir /home/liveuser/Desktop -p >/dev/null
419
mkdir /home/liveuser/Desktop -p >/dev/null
420
cat /usr/share/applications/system-config-keyboard.desktop | sed '/NotShowIn/d' |sed 's/Terminal=false/Terminal=true/' > /home/liveuser/Desktop/system-config-keyboard.desktop
420
cat /usr/share/applications/system-config-keyboard.desktop | sed '/NotShowIn/d' |sed 's/Terminal=false/Terminal=true/' > /home/liveuser/Desktop/system-config-keyboard.desktop
421
cat /usr/share/applications/liveinst.desktop | sed '/NoDisplay/d' > /home/liveuser/Desktop/liveinst.desktop 
421
cat /usr/share/applications/liveinst.desktop | sed '/NoDisplay/d' > /home/liveuser/Desktop/liveinst.desktop 
422
chmod +x /home/liveuser/Desktop/*.desktop
422
chmod +x /home/liveuser/Desktop/*.desktop
423
chown -R liveuser:liveuser /home/liveuser
423
chown -R liveuser:liveuser /home/liveuser
424
 
424
 
425
# Liveuser face
425
# Liveuser face
426
if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
426
if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
427
    cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /home/liveuser/.face
427
    cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /home/liveuser/.face
428
    chown liveuser:liveuser /home/liveuser/.face
428
    chown liveuser:liveuser /home/liveuser/.face
429
fi
429
fi
430
 
430
 
431
# make the installer show up
431
# make the installer show up
432
if [ -f /usr/share/applications/liveinst.desktop ]; then
432
if [ -f /usr/share/applications/liveinst.desktop ]; then
433
  # Show harddisk install in shell dash
433
  # Show harddisk install in shell dash
434
  sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop 
434
  sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop 
435
  # need to move it to anaconda.desktop to make shell happy
435
  # need to move it to anaconda.desktop to make shell happy
436
  #cp /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop
436
  #cp /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop
437
fi
437
fi
438
  cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
438
  cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
439
[org.gnome.shell]
439
[org.gnome.shell]
440
favorite-apps=['liveinst.desktop','firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop', 'anaconda.desktop']
440
favorite-apps=['liveinst.desktop','firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop', 'anaconda.desktop']
441
FOE
441
FOE
442
 
442
 
443
# add liveinst.desktop to favorites menu
443
# add liveinst.desktop to favorites menu
444
mkdir -p /home/liveuser/.kde/share/config/
444
mkdir -p /home/liveuser/.kde/share/config/
445
cat > /home/liveuser/.kde/share/config/kickoffrc << MENU_EOF
445
cat > /home/liveuser/.kde/share/config/kickoffrc << MENU_EOF
446
[Favorites]
446
[Favorites]
447
FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/kde4/systemsettings.desktop,/usr/share/applications/liveinst.desktop
447
FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/kde4/systemsettings.desktop,/usr/share/applications/liveinst.desktop
448
MENU_EOF
448
MENU_EOF
449
 
449
 
450
# set up auto-login
450
# set up auto-login
451
cat > /etc/gdm/custom.conf << FOE
451
cat > /etc/gdm/custom.conf << FOE
452
[daemon]
452
[daemon]
453
AutomaticLoginEnable=True
453
AutomaticLoginEnable=True
454
AutomaticLogin=liveuser
454
AutomaticLogin=liveuser
455
FOE
455
FOE
456
 
456
 
457
# Turn off PackageKit-command-not-found while uninstalled
457
# Turn off PackageKit-command-not-found while uninstalled
458
if [ -f /etc/PackageKit/CommandNotFound.conf ]; then
458
if [ -f /etc/PackageKit/CommandNotFound.conf ]; then
459
  sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf
459
  sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf
460
fi
460
fi
461
 
461
 
462
# make sure to set the right permissions and selinux contexts
462
# make sure to set the right permissions and selinux contexts
463
chown -R liveuser:liveuser /home/liveuser/
463
chown -R liveuser:liveuser /home/liveuser/
464
restorecon -R /home/liveuser/
464
restorecon -R /home/liveuser/
465
 
465
 
466
# Fixing default locale to us - does not work for SL7.1
466
# Fixing default locale to us - does not work for SL7.1
467
#localectl set-keymap us
467
#localectl set-keymap us
468
#localectl set-x11-keymap us
468
#localectl set-x11-keymap us
469
EOF
469
EOF
470
 
470
 
471
# rebuild schema cache with any overrides we installed
471
# rebuild schema cache with any overrides we installed
472
glib-compile-schemas /usr/share/glib-2.0/schemas
472
glib-compile-schemas /usr/share/glib-2.0/schemas
473
 
473
 
474
 
474
 
475
%end
475
%end