Subversion Repositories livecd

Rev

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

Rev 275 Rev 277
Line 413... Line 413...
413
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool   /apps/gnome-screensaver/lock_enabled "false" >/dev/null
413
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool   /apps/gnome-screensaver/lock_enabled "false" >/dev/null
414
 
414
 
415
# disable PackageKit update checking by default
415
# disable PackageKit update checking by default
416
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
416
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
417
 
417
 
-
 
418
 
418
# detecting disk partitions and logical volumes 
419
### detecting disk partitions and logical volumes (disabled by default)
-
 
420
### use boot parameter automount to enable it
-
 
421
 
419
CreateDesktopIconHD()
422
CreateDesktopIconHD()
420
{
423
{
421
cat > /home/\\\$LIVECD_USER/Desktop/Local\ hard\ drives.desktop << EOF_HDicon
424
cat > /home/\\\$LIVECD_USER/Desktop/Local\ hard\ drives.desktop << EOF_HDicon
422
[Desktop Entry]
425
[Desktop Entry]
423
Encoding=UTF-8
426
Encoding=UTF-8
Line 450... Line 453...
450
EOF_LVMicon
453
EOF_LVMicon
451
 
454
 
452
chmod 755 /home/\\\$LIVECD_USER/Desktop/Local\ logical\ volumes.desktop
455
chmod 755 /home/\\\$LIVECD_USER/Desktop/Local\ logical\ volumes.desktop
453
}
456
}
454
 
457
 
455
# don't mount disk partitions if 'nodiskmount' is given as a boot option
458
# mount disk partitions if 'automount' is given as a boot option
456
if ! strstr "\\\`cat /proc/cmdline\\\`" nodiskmount ; then
459
if [ "\\\$( cmdline_parameter automount )" ]; then
457
	MOUNTOPTION="ro"
460
	MOUNTOPTION="rw"
458
	HARD_DISKS=\\\`egrep "[sh]d.\\\$" /proc/partitions | tr -s ' ' | sed 's/^  *//' | cut -d' ' -f4\\\`
461
	HARD_DISKS=\\\`egrep "[sh]d.\\\$" /proc/partitions | tr -s ' ' | sed 's/^  *//' | cut -d' ' -f4\\\`
459
 
462
 
460
	echo "Mounting hard disk partitions... "
463
	echo "Mounting hard disk partitions... "
461
	for DISK in \\\$HARD_DISKS; do
464
	for DISK in \\\$HARD_DISKS; do
462
	    # Get the device and system info from fdisk (but only for fat and linux partitions).
465
	    # Get the device and system info from fdisk (but only for fat and linux partitions).
Line 490... Line 493...
490
	    done
493
	    done
491
	done
494
	done
492
	echo
495
	echo
493
fi
496
fi
494
 
497
 
495
# don't mount logical volumes if 'nolvmmount' is given as a boot option
498
# mount logical volumes if 'automount' is given as a boot option
496
if ! strstr "\\\`cat /proc/cmdline\\\`" nolvmmount ; then
499
if [ "\\\$( cmdline_parameter automount )" ]; then
497
        MOUNTOPTION="ro"
500
        MOUNTOPTION="rw"
498
	FSTYPES="ext4 ext3 ext2"
501
	FSTYPES="ext4 ext3 ext2"
499
	echo "Scanning for logical volumes..."
502
	echo "Scanning for logical volumes..."
500
	if ! lvm vgscan 2>&1 | grep "No volume groups"; then
503
	if ! lvm vgscan 2>&1 | grep "No volume groups"; then
501
	    echo "Activating logical volumes ..."
504
	    echo "Activating logical volumes ..."
502
	    modprobe dm_mod >/dev/null
505
	    modprobe dm_mod >/dev/null
Line 682... Line 685...
682
sed -i "s/liveimg/liveimg 3/"                                               \$LIVE_ROOT/isolinux/textboot.txt
685
sed -i "s/liveimg/liveimg 3/"                                               \$LIVE_ROOT/isolinux/textboot.txt
683
sed -i "/menu default/d"                                                    \$LIVE_ROOT/isolinux/textboot.txt
686
sed -i "/menu default/d"                                                    \$LIVE_ROOT/isolinux/textboot.txt
684
 
687
 
685
sed "s/label linux0/label install0/"     \$LIVE_ROOT/isolinux/default.txt > \$LIVE_ROOT/isolinux/install.txt
688
sed "s/label linux0/label install0/"     \$LIVE_ROOT/isolinux/default.txt > \$LIVE_ROOT/isolinux/install.txt
686
sed -i "s/Boot/Install/"                                                    \$LIVE_ROOT/isolinux/install.txt
689
sed -i "s/Boot/Install/"                                                    \$LIVE_ROOT/isolinux/install.txt
687
sed -i "s/liveimg/liveimg liveinst noswap nolvmmount/"                      \$LIVE_ROOT/isolinux/install.txt
690
sed -i "s/liveimg/liveimg liveinst noswap/"                                 \$LIVE_ROOT/isolinux/install.txt
688
sed -i "s/ quiet / /"                                                       \$LIVE_ROOT/isolinux/install.txt
691
sed -i "s/ quiet / /"                                                       \$LIVE_ROOT/isolinux/install.txt
689
sed -i "s/ rhgb / /"                                                        \$LIVE_ROOT/isolinux/install.txt
692
sed -i "s/ rhgb / /"                                                        \$LIVE_ROOT/isolinux/install.txt
690
sed -i "/menu default/d"                                                    \$LIVE_ROOT/isolinux/install.txt
693
sed -i "/menu default/d"                                                    \$LIVE_ROOT/isolinux/install.txt
691
 
694
 
692
sed "s/label linux0/label textinstall0/" \$LIVE_ROOT/isolinux/default.txt > \$LIVE_ROOT/isolinux/textinstall.txt
695
sed "s/label linux0/label textinstall0/" \$LIVE_ROOT/isolinux/default.txt > \$LIVE_ROOT/isolinux/textinstall.txt
693
sed -i "s/Boot/Install (Text Mode)/"                                        \$LIVE_ROOT/isolinux/textinstall.txt
696
sed -i "s/Boot/Install (Text Mode)/"                                        \$LIVE_ROOT/isolinux/textinstall.txt
694
sed -i "s/liveimg/liveimg textinst noswap nolvmmount/"                      \$LIVE_ROOT/isolinux/textinstall.txt
697
sed -i "s/liveimg/liveimg textinst noswap/"                                 \$LIVE_ROOT/isolinux/textinstall.txt
695
sed -i "s/ quiet / /"                                                       \$LIVE_ROOT/isolinux/textinstall.txt
698
sed -i "s/ quiet / /"                                                       \$LIVE_ROOT/isolinux/textinstall.txt
696
sed -i "s/ rhgb / /"                                                        \$LIVE_ROOT/isolinux/textinstall.txt
699
sed -i "s/ rhgb / /"                                                        \$LIVE_ROOT/isolinux/textinstall.txt
697
sed -i "/menu default/d"                                                    \$LIVE_ROOT/isolinux/textinstall.txt
700
sed -i "/menu default/d"                                                    \$LIVE_ROOT/isolinux/textinstall.txt
698
 
701
 
699
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
702
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