| Line 380... |
Line 380... |
| 380 |
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-screensaver/lock_enabled "false" >/dev/null
|
380 |
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-screensaver/lock_enabled "false" >/dev/null
|
| 381 |
|
381 |
|
| 382 |
# disable PackageKit update checking by default
|
382 |
# disable PackageKit update checking by default
|
| 383 |
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
|
383 |
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
|
| 384 |
|
384 |
|
| - |
|
385 |
|
| 385 |
# detecting disk partitions and logical volumes
|
386 |
### detecting disk partitions and logical volumes (disabled by default)
|
| - |
|
387 |
### use boot parameter automount to enable it
|
| - |
|
388 |
|
| 386 |
CreateDesktopIconHD()
|
389 |
CreateDesktopIconHD()
|
| 387 |
{
|
390 |
{
|
| 388 |
cat > /home/\\\$LIVECD_USER/Desktop/Local\ hard\ drives.desktop << EOF_HDicon
|
391 |
cat > /home/\\\$LIVECD_USER/Desktop/Local\ hard\ drives.desktop << EOF_HDicon
|
| 389 |
[Desktop Entry]
|
392 |
[Desktop Entry]
|
| 390 |
Encoding=UTF-8
|
393 |
Encoding=UTF-8
|
| Line 417... |
Line 420... |
| 417 |
EOF_LVMicon
|
420 |
EOF_LVMicon
|
| 418 |
|
421 |
|
| 419 |
chmod 755 /home/\\\$LIVECD_USER/Desktop/Local\ logical\ volumes.desktop
|
422 |
chmod 755 /home/\\\$LIVECD_USER/Desktop/Local\ logical\ volumes.desktop
|
| 420 |
}
|
423 |
}
|
| 421 |
|
424 |
|
| 422 |
# don't mount disk partitions if 'nodiskmount' is given as a boot option
|
425 |
# mount disk partitions if 'automount' is given as a boot option
|
| 423 |
if ! strstr "\\\`cat /proc/cmdline\\\`" nodiskmount ; then
|
426 |
if [ "\\\$( cmdline_parameter automount )" ]; then
|
| 424 |
MOUNTOPTION="ro"
|
427 |
MOUNTOPTION="rw"
|
| 425 |
HARD_DISKS=\\\`egrep "[sh]d.\\\$" /proc/partitions | tr -s ' ' | sed 's/^ *//' | cut -d' ' -f4\\\`
|
428 |
HARD_DISKS=\\\`egrep "[sh]d.\\\$" /proc/partitions | tr -s ' ' | sed 's/^ *//' | cut -d' ' -f4\\\`
|
| 426 |
|
429 |
|
| 427 |
echo "Mounting hard disk partitions... "
|
430 |
echo "Mounting hard disk partitions... "
|
| 428 |
for DISK in \\\$HARD_DISKS; do
|
431 |
for DISK in \\\$HARD_DISKS; do
|
| 429 |
# Get the device and system info from fdisk (but only for fat and linux partitions).
|
432 |
# Get the device and system info from fdisk (but only for fat and linux partitions).
|
| Line 457... |
Line 460... |
| 457 |
done
|
460 |
done
|
| 458 |
done
|
461 |
done
|
| 459 |
echo
|
462 |
echo
|
| 460 |
fi
|
463 |
fi
|
| 461 |
|
464 |
|
| 462 |
# don't mount logical volumes if 'nolvmmount' is given as a boot option
|
465 |
# mount logical volumes if 'automount' is given as a boot option
|
| 463 |
if ! strstr "\\\`cat /proc/cmdline\\\`" nolvmmount ; then
|
466 |
if [ "\\\$( cmdline_parameter automount )" ]; then
|
| 464 |
MOUNTOPTION="ro"
|
467 |
MOUNTOPTION="rw"
|
| 465 |
FSTYPES="ext4 ext3 ext2"
|
468 |
FSTYPES="ext4 ext3 ext2"
|
| 466 |
echo "Scanning for logical volumes..."
|
469 |
echo "Scanning for logical volumes..."
|
| 467 |
if ! lvm vgscan 2>&1 | grep "No volume groups"; then
|
470 |
if ! lvm vgscan 2>&1 | grep "No volume groups"; then
|
| 468 |
echo "Activating logical volumes ..."
|
471 |
echo "Activating logical volumes ..."
|
| 469 |
modprobe dm_mod >/dev/null
|
472 |
modprobe dm_mod >/dev/null
|
| Line 649... |
Line 652... |
| 649 |
sed -i "s/liveimg/liveimg 3/" \$LIVE_ROOT/isolinux/textboot.txt
|
652 |
sed -i "s/liveimg/liveimg 3/" \$LIVE_ROOT/isolinux/textboot.txt
|
| 650 |
sed -i "/menu default/d" \$LIVE_ROOT/isolinux/textboot.txt
|
653 |
sed -i "/menu default/d" \$LIVE_ROOT/isolinux/textboot.txt
|
| 651 |
|
654 |
|
| 652 |
sed "s/label linux0/label install0/" \$LIVE_ROOT/isolinux/default.txt > \$LIVE_ROOT/isolinux/install.txt
|
655 |
sed "s/label linux0/label install0/" \$LIVE_ROOT/isolinux/default.txt > \$LIVE_ROOT/isolinux/install.txt
|
| 653 |
sed -i "s/Boot/Install/" \$LIVE_ROOT/isolinux/install.txt
|
656 |
sed -i "s/Boot/Install/" \$LIVE_ROOT/isolinux/install.txt
|
| 654 |
sed -i "s/liveimg/liveimg liveinst noswap nolvmmount/" \$LIVE_ROOT/isolinux/install.txt
|
657 |
sed -i "s/liveimg/liveimg liveinst noswap/" \$LIVE_ROOT/isolinux/install.txt
|
| 655 |
sed -i "s/ quiet / /" \$LIVE_ROOT/isolinux/install.txt
|
658 |
sed -i "s/ quiet / /" \$LIVE_ROOT/isolinux/install.txt
|
| 656 |
sed -i "s/ rhgb / /" \$LIVE_ROOT/isolinux/install.txt
|
659 |
sed -i "s/ rhgb / /" \$LIVE_ROOT/isolinux/install.txt
|
| 657 |
sed -i "/menu default/d" \$LIVE_ROOT/isolinux/install.txt
|
660 |
sed -i "/menu default/d" \$LIVE_ROOT/isolinux/install.txt
|
| 658 |
|
661 |
|
| 659 |
sed "s/label linux0/label textinstall0/" \$LIVE_ROOT/isolinux/default.txt > \$LIVE_ROOT/isolinux/textinstall.txt
|
662 |
sed "s/label linux0/label textinstall0/" \$LIVE_ROOT/isolinux/default.txt > \$LIVE_ROOT/isolinux/textinstall.txt
|
| 660 |
sed -i "s/Boot/Install (Text Mode)/" \$LIVE_ROOT/isolinux/textinstall.txt
|
663 |
sed -i "s/Boot/Install (Text Mode)/" \$LIVE_ROOT/isolinux/textinstall.txt
|
| 661 |
sed -i "s/liveimg/liveimg textinst noswap nolvmmount/" \$LIVE_ROOT/isolinux/textinstall.txt
|
664 |
sed -i "s/liveimg/liveimg textinst noswap/" \$LIVE_ROOT/isolinux/textinstall.txt
|
| 662 |
sed -i "s/ quiet / /" \$LIVE_ROOT/isolinux/textinstall.txt
|
665 |
sed -i "s/ quiet / /" \$LIVE_ROOT/isolinux/textinstall.txt
|
| 663 |
sed -i "s/ rhgb / /" \$LIVE_ROOT/isolinux/textinstall.txt
|
666 |
sed -i "s/ rhgb / /" \$LIVE_ROOT/isolinux/textinstall.txt
|
| 664 |
sed -i "/menu default/d" \$LIVE_ROOT/isolinux/textinstall.txt
|
667 |
sed -i "/menu default/d" \$LIVE_ROOT/isolinux/textinstall.txt
|
| 665 |
|
668 |
|
| 666 |
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
|
669 |
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
|