Subversion Repositories livecd

Rev

Rev 275 | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 275 Rev 276
Line 296... Line 296...
296
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool   /apps/gnome-screensaver/lock_enabled "false" >/dev/null
296
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool   /apps/gnome-screensaver/lock_enabled "false" >/dev/null
297
 
297
 
298
# disable PackageKit update checking by default
298
# disable PackageKit update checking by default
299
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t int /apps/gnome-packagekit/update-icon/frequency_get_updates "0" >/dev/null
299
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t int /apps/gnome-packagekit/update-icon/frequency_get_updates "0" >/dev/null
300
 
300
 
-
 
301
 
301
# detecting disk partitions and logical volumes 
302
### detecting disk partitions and logical volumes (disabled by default)
-
 
303
### use boot parameter automount to enable it
-
 
304
 
302
CreateDesktopIconHD()
305
CreateDesktopIconHD()
303
{
306
{
304
cat > /home/\\\$LIVECD_USER/Desktop/Local\ hard\ drives.desktop << EOF_HDicon
307
cat > /home/\\\$LIVECD_USER/Desktop/Local\ hard\ drives.desktop << EOF_HDicon
305
[Desktop Entry]
308
[Desktop Entry]
306
Encoding=UTF-8
309
Encoding=UTF-8
Line 333... Line 336...
333
EOF_LVMicon
336
EOF_LVMicon
334
 
337
 
335
chmod 755 /home/\\\$LIVECD_USER/Desktop/Local\ logical\ volumes.desktop
338
chmod 755 /home/\\\$LIVECD_USER/Desktop/Local\ logical\ volumes.desktop
336
}
339
}
337
 
340
 
338
# don't mount disk partitions if 'nodiskmount' is given as a boot option
341
# mount disk partitions if 'automount' is given as a boot option
339
if ! strstr "\\\`cat /proc/cmdline\\\`" nodiskmount ; then
342
if [ "\\\$( cmdline_parameter automount )" ]; then
340
	MOUNTOPTION="ro"
343
	MOUNTOPTION="rw"
341
	HARD_DISKS=\\\`egrep "[sh]d.\\\$" /proc/partitions | tr -s ' ' | sed 's/^  *//' | cut -d' ' -f4\\\`
344
	HARD_DISKS=\\\`egrep "[sh]d.\\\$" /proc/partitions | tr -s ' ' | sed 's/^  *//' | cut -d' ' -f4\\\`
342
 
345
 
343
	echo "Mounting hard disk partitions... "
346
	echo "Mounting hard disk partitions... "
344
	for DISK in \\\$HARD_DISKS; do
347
	for DISK in \\\$HARD_DISKS; do
345
	    # Get the device and system info from fdisk (but only for fat and linux partitions).
348
	    # Get the device and system info from fdisk (but only for fat and linux partitions).
Line 373... Line 376...
373
	    done
376
	    done
374
	done
377
	done
375
	echo
378
	echo
376
fi
379
fi
377
 
380
 
378
# don't mount logical volumes if 'nolvmmount' is given as a boot option
381
# mount logical volumes if 'automount' is given as a boot option
379
if ! strstr "\\\`cat /proc/cmdline\\\`" nolvmmount ; then
382
if [ "\\\$( cmdline_parameter automount )" ]; then
380
        MOUNTOPTION="ro"
383
        MOUNTOPTION="rw"
381
	FSTYPES="ext4 ext3 ext2"
384
	FSTYPES="ext4 ext3 ext2"
382
	echo "Scanning for logical volumes..."
385
	echo "Scanning for logical volumes..."
383
	if ! lvm vgscan 2>&1 | grep "No volume groups"; then
386
	if ! lvm vgscan 2>&1 | grep "No volume groups"; then
384
	    echo "Activating logical volumes ..."
387
	    echo "Activating logical volumes ..."
385
	    modprobe dm_mod >/dev/null
388
	    modprobe dm_mod >/dev/null
Line 565... Line 568...
565
sed -i "s/liveimg/liveimg 3/"                                               \$LIVE_ROOT/isolinux/textboot.txt
568
sed -i "s/liveimg/liveimg 3/"                                               \$LIVE_ROOT/isolinux/textboot.txt
566
sed -i "/menu default/d"                                                    \$LIVE_ROOT/isolinux/textboot.txt
569
sed -i "/menu default/d"                                                    \$LIVE_ROOT/isolinux/textboot.txt
567
 
570
 
568
sed "s/label linux0/label install0/"     \$LIVE_ROOT/isolinux/default.txt > \$LIVE_ROOT/isolinux/install.txt
571
sed "s/label linux0/label install0/"     \$LIVE_ROOT/isolinux/default.txt > \$LIVE_ROOT/isolinux/install.txt
569
sed -i "s/Boot/Install/"                                                    \$LIVE_ROOT/isolinux/install.txt
572
sed -i "s/Boot/Install/"                                                    \$LIVE_ROOT/isolinux/install.txt
570
sed -i "s/liveimg/liveimg liveinst noswap nolvmmount/"                      \$LIVE_ROOT/isolinux/install.txt
573
sed -i "s/liveimg/liveimg liveinst noswap/"                                 \$LIVE_ROOT/isolinux/install.txt
571
sed -i "s/ quiet / /"                                                       \$LIVE_ROOT/isolinux/install.txt
574
sed -i "s/ quiet / /"                                                       \$LIVE_ROOT/isolinux/install.txt
572
sed -i "s/ rhgb / /"                                                        \$LIVE_ROOT/isolinux/install.txt
575
sed -i "s/ rhgb / /"                                                        \$LIVE_ROOT/isolinux/install.txt
573
sed -i "/menu default/d"                                                    \$LIVE_ROOT/isolinux/install.txt
576
sed -i "/menu default/d"                                                    \$LIVE_ROOT/isolinux/install.txt
574
 
577
 
575
sed "s/label linux0/label textinstall0/" \$LIVE_ROOT/isolinux/default.txt > \$LIVE_ROOT/isolinux/textinstall.txt
578
sed "s/label linux0/label textinstall0/" \$LIVE_ROOT/isolinux/default.txt > \$LIVE_ROOT/isolinux/textinstall.txt
576
sed -i "s/Boot/Install (Text Mode)/"                                        \$LIVE_ROOT/isolinux/textinstall.txt
579
sed -i "s/Boot/Install (Text Mode)/"                                        \$LIVE_ROOT/isolinux/textinstall.txt
577
sed -i "s/liveimg/liveimg textinst noswap nolvmmount/"                      \$LIVE_ROOT/isolinux/textinstall.txt
580
sed -i "s/liveimg/liveimg textinst noswap/"                                 \$LIVE_ROOT/isolinux/textinstall.txt
578
sed -i "s/ quiet / /"                                                       \$LIVE_ROOT/isolinux/textinstall.txt
581
sed -i "s/ quiet / /"                                                       \$LIVE_ROOT/isolinux/textinstall.txt
579
sed -i "s/ rhgb / /"                                                        \$LIVE_ROOT/isolinux/textinstall.txt
582
sed -i "s/ rhgb / /"                                                        \$LIVE_ROOT/isolinux/textinstall.txt
580
sed -i "/menu default/d"                                                    \$LIVE_ROOT/isolinux/textinstall.txt
583
sed -i "/menu default/d"                                                    \$LIVE_ROOT/isolinux/textinstall.txt
581
 
584
 
582
cat \$LIVE_ROOT/isolinux/default.txt \$LIVE_ROOT/isolinux/basicvideo.txt \$LIVE_ROOT/isolinux/check.txt \$LIVE_ROOT/isolinux/memtest.txt \$LIVE_ROOT/isolinux/localboot.txt > \$LIVE_ROOT/isolinux/current.txt
585
cat \$LIVE_ROOT/isolinux/default.txt \$LIVE_ROOT/isolinux/basicvideo.txt \$LIVE_ROOT/isolinux/check.txt \$LIVE_ROOT/isolinux/memtest.txt \$LIVE_ROOT/isolinux/localboot.txt > \$LIVE_ROOT/isolinux/current.txt