Subversion Repositories livecd

Rev

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

Rev 309 Rev 310
Line 101... Line 101...
101
#--------------------------------------------------------------------
101
#--------------------------------------------------------------------
102
 
102
 
103
# default LiveCD user
103
# default LiveCD user
104
LIVECD_DEF_USER="liveuser"
104
LIVECD_DEF_USER="liveuser"
105
 
105
 
106
# delay in sec. before auto login
106
# delay in seconds before auto login
107
LOGIN_DELAY=15
107
LOGIN_DELAY=15
108
 
108
 
109
# Services which are off (not running) on the LiveCD
109
# Services which are off (not running) on the LiveCD
110
SERVICES_OFF="mdmonitor setroubleshoot auditd crond atd readahead_early \
110
SERVICES_OFF="mdmonitor setroubleshoot auditd crond atd readahead_early \
111
              readahead_later kdump microcode_ctl openct pcscd postfix"
111
              readahead_later kdump microcode_ctl openct pcscd postfix  \
-
 
112
	      yum-updatesd"
112
 
113
 
113
# Services which should be on, but are not on per default
114
# Services which should be on, but are not on per default
114
SERVICES_ON=""
115
SERVICES_ON=""
115
 
116
 
116
EOF_livesysconf
117
EOF_livesysconf
Line 172... Line 173...
172
. /etc/init.d/functions
173
. /etc/init.d/functions
173
. /etc/livesys.conf
174
. /etc/livesys.conf
174
. /etc/init.d/livesys.functions
175
. /etc/init.d/livesys.functions
175
 
176
 
176
# exit if not running from LiveCD
177
# exit if not running from LiveCD
177
if ! strstr "\\\`cat /proc/cmdline\\\`" liveimg || [ "\\\$1" != "start" ]; then
178
if [ ! "\\\$( cmdline_parameter liveimg )" ] || [ "\\\$1" != "start" ]; then
178
    exit 0
179
    exit 0
179
fi
180
fi
180
 
181
 
181
[ -e /.liveimg-configured ] && configdone=1
182
[ -e /.liveimg-configured ] && configdone=1
182
 
183
 
Line 210... Line 211...
210
if [ -b \\\`readlink -f /dev/live\\\` ]; then
211
if [ -b \\\`readlink -f /dev/live\\\` ]; then
211
   mkdir -p /mnt/live
212
   mkdir -p /mnt/live
212
   mount -o ro /dev/live /mnt/live 2>/dev/null || mount /dev/live /mnt/live
213
   mount -o ro /dev/live /mnt/live 2>/dev/null || mount /dev/live /mnt/live
213
fi
214
fi
214
 
215
 
215
livedir="LiveOS"
-
 
216
for arg in \\\`cat /proc/cmdline\\\` ; do
216
livedir=\\\$( cmdline_value live_dir )
217
  if [ "\\\${arg##live_dir=}" != "\\\${arg}" ]; then
217
[ ! "\\\$livedir ] && livedir="LiveOS"
218
    livedir=\\\${arg##live_dir=}
-
 
219
    return
-
 
220
  fi
-
 
221
done
-
 
222
 
218
 
223
### enable swaps unless requested otherwise
219
### enable swaps unless requested otherwise
224
swaps=\\\`blkid -t TYPE=swap -o device\\\`
220
swaps=\\\`blkid -t TYPE=swap -o device\\\`
225
if ! strstr "\\\`cat /proc/cmdline\\\`" noswap && [ -n "\\\$swaps" ] ; then
221
if [ ! "\\\$( cmdline_parameter noswap )" ] && [ -n "\\\$swaps" ] ; then
226
  for s in \\\$swaps ; do
222
  for s in \\\$swaps ; do
227
    action "Enabling swap partition \\\$s" swapon \\\$s
223
    action "Enabling swap partition \\\$s" swapon \\\$s
228
  done
224
  done
229
fi
225
fi
230
if ! strstr "\\\`cat /proc/cmdline\\\`" noswap && [ -f /mnt/live/\\\${livedir}/swap.img ] ; then
226
if [ ! "\\\$( cmdline_parameter noswap )" ] && [ -f /mnt/live/\\\${livedir}/swap.img ] ; then
231
  action "Enabling swap file" swapon /mnt/live/\\\${livedir}/swap.img
227
  action "Enabling swap file" swapon /mnt/live/\\\${livedir}/swap.img
232
fi
228
fi
233
 
229
 
234
### functions for persisten Home 
230
### functions for persisten Home 
235
mountPersistentHome() {
231
mountPersistentHome() {
Line 404... Line 400...
404
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_check_hardware false >/dev/null
400
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_check_hardware false >/dev/null
405
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_codec_helper false >/dev/null
401
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_codec_helper false >/dev/null
406
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_font_helper false >/dev/null
402
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_font_helper false >/dev/null
407
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_mime_type_helper false >/dev/null
403
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_mime_type_helper false >/dev/null
408
 
404
 
-
 
405
### don't enable the gnome-settings-daemon packagekit plugin
-
 
406
gsettings set org.gnome.settings-daemon.plugins.updates active 'false' 
-
 
407
 
409
### start system-config-firewall with su 
408
### start system-config-firewall with su 
410
#  (bugfix: system-config-firewall does not work when root has no password)
409
#  (bugfix: system-config-firewall does not work when root has no password)
411
sed -i "s|^Exec=.*|Exec=su - -c /usr/bin/system-config-firewall|" /usr/share/applications/system-config-firewall.desktop
410
sed -i "s|^Exec=.*|Exec=su - -c /usr/bin/system-config-firewall|" /usr/share/applications/system-config-firewall.desktop
412
sed -i "s|^Terminal=.*|Terminal=true|"                            /usr/share/applications/system-config-firewall.desktop
411
sed -i "s|^Terminal=.*|Terminal=true|"                            /usr/share/applications/system-config-firewall.desktop
413
 
412
 
-
 
413
### don't use prelink on a running live image
-
 
414
sed -i 's/PRELINKING=yes/PRELINKING=no/' /etc/sysconfig/prelink &>/dev/null
-
 
415
 
414
 
416
 
415
###-----------------------------------------------------------------------
417
###-----------------------------------------------------------------------
416
# detecting disk partitions and logical volumes (disabled by default)
418
# detecting disk partitions and logical volumes (disabled by default)
417
# use boot parameter automount to enable it
419
# use boot parameter automount to enable it
418
###-----------------------------------------------------------------------
420
###-----------------------------------------------------------------------
Line 559... Line 561...
559
. /etc/init.d/functions
561
. /etc/init.d/functions
560
. /etc/livesys.conf
562
. /etc/livesys.conf
561
. /etc/init.d/livesys.functions
563
. /etc/init.d/livesys.functions
562
 
564
 
563
# exit if not running from LiveCD
565
# exit if not running from LiveCD
564
if ! strstr "\\\`cat /proc/cmdline\\\`" liveimg || [ "\\\$1" != "start" ]; then
566
if [ ! "\\\$( cmdline_parameter liveimg )" ] || [ "\\\$1" != "start" ]; then
565
    exit 0
567
    exit 0
566
fi
568
fi
567
 
569
 
568
touch /.liveimg-late-configured
570
touch /.liveimg-late-configured
569
 
571
 
Line 583... Line 585...
583
   /usr/sbin/liveinst --text \\\$ks
585
   /usr/sbin/liveinst --text \\\$ks
584
   /sbin/reboot
586
   /sbin/reboot
585
fi
587
fi
586
 
588
 
587
# configure X, allowing user to override xdriver
589
# configure X, allowing user to override xdriver
588
if [ "\\\$xdriver" ]; then
590
if [ -n "\$xdriver" ]; then
589
    exists system-config-display --noui --reconfig --set-depth=24 --set-driver=\\\$xdriver
591
   cat > /etc/X11/xorg.conf.d/00-xdriver.conf <<FOE
-
 
592
Section "Device"
-
 
593
        Identifier      "Videocard0"
-
 
594
        Driver  "\$xdriver"
-
 
595
EndSection
-
 
596
FOE
590
fi
597
fi
591
 
598
 
592
# configure keyboard
599
# configure keyboard
593
if [ "\\\$kb" ]; then
600
if [ "\\\$kb" ]; then
594
    exists system-config-keyboard --noui \\\$kb 
601
    exists system-config-keyboard --noui \\\$kb 
595
fi
602
fi
596
 
603
 
-
 
604
 
597
EOF_lateinitscript
605
EOF_lateinitscript
598
#***********************************************************************
606
#***********************************************************************
599
# End of livesys-late script
607
# End of livesys-late script
600
#***********************************************************************
608
#***********************************************************************
601
 
609