Subversion Repositories livecd

Rev

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

Rev 275 Rev 277
Line 395... Line 395...
395
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool   /apps/gnome-screensaver/lock_enabled "false" >/dev/null
395
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool   /apps/gnome-screensaver/lock_enabled "false" >/dev/null
396
 
396
 
397
# disable PackageKit update checking by default
397
# disable PackageKit update checking by default
398
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
398
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
399
 
399
 
-
 
400
 
400
# detecting disk partitions and logical volumes 
401
### detecting disk partitions and logical volumes (disabled by default)
-
 
402
### use boot parameter automount to enable it
-
 
403
 
401
CreateDesktopIconHD()
404
CreateDesktopIconHD()
402
{
405
{
403
cat > /home/\\\$LIVECD_USER/Desktop/Local\ hard\ drives.desktop << EOF_HDicon
406
cat > /home/\\\$LIVECD_USER/Desktop/Local\ hard\ drives.desktop << EOF_HDicon
404
[Desktop Entry]
407
[Desktop Entry]
405
Encoding=UTF-8
408
Encoding=UTF-8
Line 432... Line 435...
432
EOF_LVMicon
435
EOF_LVMicon
433
 
436
 
434
chmod 755 /home/\\\$LIVECD_USER/Desktop/Local\ logical\ volumes.desktop
437
chmod 755 /home/\\\$LIVECD_USER/Desktop/Local\ logical\ volumes.desktop
435
}
438
}
436
 
439
 
437
# don't mount disk partitions if 'nodiskmount' is given as a boot option
440
# mount disk partitions if 'automount' is given as a boot option
438
if ! strstr "\\\`cat /proc/cmdline\\\`" nodiskmount ; then
441
if [ "\\\$( cmdline_parameter automount )" ]; then
439
	MOUNTOPTION="ro"
442
	MOUNTOPTION="rw"
440
	HARD_DISKS=\\\`egrep "[sh]d.\\\$" /proc/partitions | tr -s ' ' | sed 's/^  *//' | cut -d' ' -f4\\\`
443
	HARD_DISKS=\\\`egrep "[sh]d.\\\$" /proc/partitions | tr -s ' ' | sed 's/^  *//' | cut -d' ' -f4\\\`
441
 
444
 
442
	echo "Mounting hard disk partitions... "
445
	echo "Mounting hard disk partitions... "
443
	for DISK in \\\$HARD_DISKS; do
446
	for DISK in \\\$HARD_DISKS; do
444
	    # Get the device and system info from fdisk (but only for fat and linux partitions).
447
	    # Get the device and system info from fdisk (but only for fat and linux partitions).
Line 472... Line 475...
472
	    done
475
	    done
473
	done
476
	done
474
	echo
477
	echo
475
fi
478
fi
476
 
479
 
477
# don't mount logical volumes if 'nolvmmount' is given as a boot option
480
# mount logical volumes if 'automount' is given as a boot option
478
if ! strstr "\\\`cat /proc/cmdline\\\`" nolvmmount ; then
481
if [ "\\\$( cmdline_parameter automount )" ]; then
479
        MOUNTOPTION="ro"
482
        MOUNTOPTION="rw"
480
	FSTYPES="ext4 ext3 ext2"
483
	FSTYPES="ext4 ext3 ext2"
481
	echo "Scanning for logical volumes..."
484
	echo "Scanning for logical volumes..."
482
	if ! lvm vgscan 2>&1 | grep "No volume groups"; then
485
	if ! lvm vgscan 2>&1 | grep "No volume groups"; then
483
	    echo "Activating logical volumes ..."
486
	    echo "Activating logical volumes ..."
484
	    modprobe dm_mod >/dev/null
487
	    modprobe dm_mod >/dev/null
Line 664... Line 667...
664
sed -i "s/liveimg/liveimg 3/"                                               \$LIVE_ROOT/isolinux/textboot.txt
667
sed -i "s/liveimg/liveimg 3/"                                               \$LIVE_ROOT/isolinux/textboot.txt
665
sed -i "/menu default/d"                                                    \$LIVE_ROOT/isolinux/textboot.txt
668
sed -i "/menu default/d"                                                    \$LIVE_ROOT/isolinux/textboot.txt
666
 
669
 
667
sed "s/label linux0/label install0/"     \$LIVE_ROOT/isolinux/default.txt > \$LIVE_ROOT/isolinux/install.txt
670
sed "s/label linux0/label install0/"     \$LIVE_ROOT/isolinux/default.txt > \$LIVE_ROOT/isolinux/install.txt
668
sed -i "s/Boot/Install/"                                                    \$LIVE_ROOT/isolinux/install.txt
671
sed -i "s/Boot/Install/"                                                    \$LIVE_ROOT/isolinux/install.txt
669
sed -i "s/liveimg/liveimg liveinst noswap nolvmmount/"                      \$LIVE_ROOT/isolinux/install.txt
672
sed -i "s/liveimg/liveimg liveinst noswap/"                                 \$LIVE_ROOT/isolinux/install.txt
670
sed -i "s/ quiet / /"                                                       \$LIVE_ROOT/isolinux/install.txt
673
sed -i "s/ quiet / /"                                                       \$LIVE_ROOT/isolinux/install.txt
671
sed -i "s/ rhgb / /"                                                        \$LIVE_ROOT/isolinux/install.txt
674
sed -i "s/ rhgb / /"                                                        \$LIVE_ROOT/isolinux/install.txt
672
sed -i "/menu default/d"                                                    \$LIVE_ROOT/isolinux/install.txt
675
sed -i "/menu default/d"                                                    \$LIVE_ROOT/isolinux/install.txt
673
 
676
 
674
sed "s/label linux0/label textinstall0/" \$LIVE_ROOT/isolinux/default.txt > \$LIVE_ROOT/isolinux/textinstall.txt
677
sed "s/label linux0/label textinstall0/" \$LIVE_ROOT/isolinux/default.txt > \$LIVE_ROOT/isolinux/textinstall.txt
675
sed -i "s/Boot/Install (Text Mode)/"                                        \$LIVE_ROOT/isolinux/textinstall.txt
678
sed -i "s/Boot/Install (Text Mode)/"                                        \$LIVE_ROOT/isolinux/textinstall.txt
676
sed -i "s/liveimg/liveimg textinst noswap nolvmmount/"                      \$LIVE_ROOT/isolinux/textinstall.txt
679
sed -i "s/liveimg/liveimg textinst noswap/"                                 \$LIVE_ROOT/isolinux/textinstall.txt
677
sed -i "s/ quiet / /"                                                       \$LIVE_ROOT/isolinux/textinstall.txt
680
sed -i "s/ quiet / /"                                                       \$LIVE_ROOT/isolinux/textinstall.txt
678
sed -i "s/ rhgb / /"                                                        \$LIVE_ROOT/isolinux/textinstall.txt
681
sed -i "s/ rhgb / /"                                                        \$LIVE_ROOT/isolinux/textinstall.txt
679
sed -i "/menu default/d"                                                    \$LIVE_ROOT/isolinux/textinstall.txt
682
sed -i "/menu default/d"                                                    \$LIVE_ROOT/isolinux/textinstall.txt
680
 
683
 
681
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
684
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