kadischi/rc userhome.sh,1.1,1.2
Jasper O'neal Hartline (autopsy)
fedora-extras-commits at redhat.com
Sat Jul 8 22:51:17 UTC 2006
- Previous message: rpms/nexuiz-data/FC-4 .cvsignore, 1.4, 1.5 nexuiz-data.spec, 1.3, 1.4 sources, 1.4, 1.5
- Next message: rpms/nexuiz/FC-5 .cvsignore, 1.5, 1.6 nexuiz.spec, 1.11, 1.12 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: autopsy
Update of /cvs/devel/kadischi/rc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24352/kadischi/rc
Modified Files:
userhome.sh
Log Message:
Fix up userhome.sh to display properly in low resolutions
Index: userhome.sh
===================================================================
RCS file: /cvs/devel/kadischi/rc/userhome.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- userhome.sh 3 Jul 2006 18:48:36 -0000 1.1
+++ userhome.sh 8 Jul 2006 22:51:15 -0000 1.2
@@ -8,7 +8,7 @@
if [ -f /tmp/.disk.partition ]; then
PARTITION=$(cat /tmp/.disk.partition)
### Begin filesytsem type choices
- dialog --backtitle "Kadischi User Data" --title "Kadischi user partition filesystem selection" --begin 12 45 --aspect 0 --shadow --menu "Please choose the filesystem type on $PARTITION to be mounted under /home" 20 60 3 ext2 "Extended Second Filesystem" ext3 "Extended Third Filesystem" vfat "Virtual FAT Filesystems" 2>/tmp/.disk.partition.fstype
+ dialog --backtitle "Kadischi User Data" --title "Kadischi user partition filesystem selection" --begin 6 9 --aspect 0 --shadow --menu "Please choose the filesystem type on $PARTITION to be mounted under /home" 20 60 3 ext2 "Extended Second Filesystem" ext3 "Extended Third Filesystem" vfat "Virtual FAT Filesystems" 2>/tmp/.disk.partition.fstype
else
exit 1
fi
@@ -22,7 +22,7 @@
umount /home
mount -t $FSTYPE $PARTITION /home
if [ "$?" -eq "0" ]; then
- dialog --backtitle "Kadischi User Data" --begin 12 45 --aspect 0 --shadow --msgbox "Success! Mounted $DISK$PARTITION on /home as $FSTYPE , Done! If a non-root user doesn't already exist, create one now and logout, then log back in as your user." 12 60
+ dialog --backtitle "Kadischi User Data" --begin 6 9 --aspect 0 --shadow --msgbox "Success! Mounted $DISK$PARTITION on /home as $FSTYPE , Done! If a non-root user doesn't already exist, create one now and logout, then log back in as your user." 12 60
sleep 20
exit 0
else
@@ -50,19 +50,20 @@
if [ "$UID" -eq "0" ]; then
if [ -x /usr/bin/dialog ]; then
- dialog --backtitle "Kadischi User Data" --title "Kadischi data configuration and save" --begin 12 35 --aspect 0 --shadow --yesno \
- "This menu system is designed to allow a user to mount a partition as /home under the LiveCD environment to save user data and configurations.
+ dialog --backtitle "Kadischi User Data" --title "Kadischi data configuration and save" --begin 6 9 --aspect 0 --shadow --yesno \
+ "This menu system is designed to allow a user to mount a partition as /home under the LiveCD environment to save user data and configurations.
+
Would you like to continue?" 10 80
if [ "$?" -eq "0" ]; then
### Begin user disk and partition selections
- dialog --backtitle "Kadischi User Data" --title "Kadischi user disk selection" --begin 12 45 --aspect 0 --shadow --menu "Please choose the
+ dialog --backtitle "Kadischi User Data" --title "Kadischi user disk selection" --begin 6 9 --aspect 0 --shadow --menu "Please choose the
disk that contains our mountable partition" 20 60 8 /dev/hda "First IDE disk" /dev/hdb "Second IDE disk" /dev/hdc "Third IDE disk" /dev/hdd "Fourth IDE disk" /dev/sda "First SCSI disk" /dev/sdb "Second SCSI disk" /dev/sdc "Third SCSI disk" /dev/sdd "Fourth SCSI disk" 2>/tmp/.disk
if [ -f /tmp/.disk ]; then
DISK=$(cat /tmp/.disk)
if [ "$DISK" == "/dev/hda" ]; then
- dialog --backtitle "Kadischi User Data" --title "Kadischi user partition selection" --begin 12 45 --aspect 0 --shadow --menu "Please choose the partition on $DISK to be mounted under /home" 20 60 4 /dev/hda1 "First partition" /dev/hda2 "Second partition" /dev/hda3 "Third partition" /dev/hda4 "Fourth partition" 2>/tmp/.disk.partition
+ dialog --backtitle "Kadischi User Data" --title "Kadischi user partition selection" --begin 6 9 --aspect 0 --shadow --menu "Please choose the partition on $DISK to be mounted under /home" 20 60 4 /dev/hda1 "First partition" /dev/hda2 "Second partition" /dev/hda3 "Third partition" /dev/hda4 "Fourth partition" 2>/tmp/.disk.partition
if [ "$?" -eq "0" ]; then
get_fstype
do_mount
@@ -73,7 +74,7 @@
fi
elif [ "$DISK" == "/dev/hdb" ]; then
- dialog --backtitle "Kadischi User Data" --title "Kadischi user partition selection" --begin 12 45 --aspect 0 --shadow --menu "Please choose the partition on $DISK to be mounted under /home" 20 60 4 /dev/hdb1 "First partition" /dev/hdb2 "Second partition" /dev/hdb3 "Third partition" /dev/hdb4 "Fourth partition" 2>/tmp/.disk.partition
+ dialog --backtitle "Kadischi User Data" --title "Kadischi user partition selection" --begin 6 9 --aspect 0 --shadow --menu "Please choose the partition on $DISK to be mounted under /home" 20 60 4 /dev/hdb1 "First partition" /dev/hdb2 "Second partition" /dev/hdb3 "Third partition" /dev/hdb4 "Fourth partition" 2>/tmp/.disk.partition
if [ "$?" -eq "0" ]; then
get_fstype
do_mount
@@ -84,7 +85,7 @@
fi
elif [ "$DISK" == "/dev/hdc" ]; then
- dialog --backtitle "Kadischi User Data" --title "Kadischi user partition selection" --begin 12 45 --aspect 0 --shadow --menu "Please choose the partition on $DISK to be mounted under /home" 20 60 4 /dev/hdc1 "First partition" /dev/hdc2 "Second partition" /dev/hdc3 "Third partition" /dev/hdc4 "Fourth partition" 2>/tmp/.disk.partition
+ dialog --backtitle "Kadischi User Data" --title "Kadischi user partition selection" --begin 6 9 --aspect 0 --shadow --menu "Please choose the partition on $DISK to be mounted under /home" 20 60 4 /dev/hdc1 "First partition" /dev/hdc2 "Second partition" /dev/hdc3 "Third partition" /dev/hdc4 "Fourth partition" 2>/tmp/.disk.partition
if [ "$?" -eq "0" ]; then
get_fstype
do_mount
@@ -95,7 +96,7 @@
fi
elif [ "$DISK" == "/dev/hdd" ]; then
- dialog --backtitle "Kadischi User Data" --title "Kadischi user partition selection" --begin 12 45 --aspect 0 --shadow --menu "Please choose the partition on $DISK to be mounted under /home" 20 60 4 /dev/hdd1 "First partition" /dev/hdd2 "Second partition" /dev/hdd3 "Third partition" /dev/hdd4 "Fourth partition" 2>/tmp/.disk.partition
+ dialog --backtitle "Kadischi User Data" --title "Kadischi user partition selection" --begin 6 9 --aspect 0 --shadow --menu "Please choose the partition on $DISK to be mounted under /home" 20 60 4 /dev/hdd1 "First partition" /dev/hdd2 "Second partition" /dev/hdd3 "Third partition" /dev/hdd4 "Fourth partition" 2>/tmp/.disk.partition
if [ "$?" -eq "0" ]; then
get_fstype
do_mount
@@ -106,7 +107,7 @@
fi
elif [ "$DISK" == "/dev/sda" ]; then
- dialog --backtitle "Kadischi User Data" --title "Kadischi user partition selection" --begin 12 45 --aspect 0 --shadow --menu "Please choose the partition on $DISK to be mounted under /home" 20 60 4 /dev/sda1 "First partition" /dev/sda2 "Second partition" /dev/sda3 "Third partition" /dev/sda4 "Fourth partition" 2>/tmp/.disk.partition
+ dialog --backtitle "Kadischi User Data" --title "Kadischi user partition selection" --begin 6 9 --aspect 0 --shadow --menu "Please choose the partition on $DISK to be mounted under /home" 20 60 4 /dev/sda1 "First partition" /dev/sda2 "Second partition" /dev/sda3 "Third partition" /dev/sda4 "Fourth partition" 2>/tmp/.disk.partition
if [ "$?" -eq "0" ]; then
get_fstype
do_mount
@@ -117,7 +118,7 @@
fi
elif [ "$DISK" == "/dev/sdb" ]; then
- dialog --backtitle "Kadischi User Data" --title "Kadischi user partition selection" --begin 12 45 --aspect 0 --shadow --menu "Please choose the partition on $DISK to be mounted under /home" 20 60 4 /dev/sdb1 "First partition" /dev/sdb2 "Second partition" /dev/sdb3 "Third partition" /dev/sdb4 "Fourth partition" 2>/tmp/.disk.partition
+ dialog --backtitle "Kadischi User Data" --title "Kadischi user partition selection" --begin 6 9 --aspect 0 --shadow --menu "Please choose the partition on $DISK to be mounted under /home" 20 60 4 /dev/sdb1 "First partition" /dev/sdb2 "Second partition" /dev/sdb3 "Third partition" /dev/sdb4 "Fourth partition" 2>/tmp/.disk.partition
if [ "$?" -eq "0" ]; then
get_fstype
do_mount
@@ -128,7 +129,7 @@
fi
elif [ "$DISK" == "/dev/sdc" ]; then
- dialog --backtitle "Kadischi User Data" --title "Kadischi user partition selection" --begin 12 45 --aspect 0 --shadow --menu "Please choose the partition on $DISK to be mounted under /home" 20 60 4 /dev/sdc1 "First partition" /dev/sdc2 "Second partition" /dev/sdc3 "Third partition" /dev/sdc4 "Fourth partition" 2>/tmp/.disk.partition
+ dialog --backtitle "Kadischi User Data" --title "Kadischi user partition selection" --begin 6 9 --aspect 0 --shadow --menu "Please choose the partition on $DISK to be mounted under /home" 20 60 4 /dev/sdc1 "First partition" /dev/sdc2 "Second partition" /dev/sdc3 "Third partition" /dev/sdc4 "Fourth partition" 2>/tmp/.disk.partition
if [ "$?" -eq "0" ]; then
get_fstype
do_mount
@@ -139,7 +140,7 @@
fi
elif [ "$DISK" == "/dev/sdd" ]; then
- dialog --backtitle "Kadischi User Data" --title "Kadischi user partition selection" --begin 12 45 --aspect 0 --shadow --menu "Please choose the partition on $DISK to be mounted under /home" 20 60 4 /dev/sdd1 "First partition" /dev/sdd2 "Second partition" /dev/sdd3 "Third partition" /dev/sdd4 "Fourth partition" 2>/tmp/.disk.partition
+ dialog --backtitle "Kadischi User Data" --title "Kadischi user partition selection" --begin 6 9 --aspect 0 --shadow --menu "Please choose the partition on $DISK to be mounted under /home" 20 60 4 /dev/sdd1 "First partition" /dev/sdd2 "Second partition" /dev/sdd3 "Third partition" /dev/sdd4 "Fourth partition" 2>/tmp/.disk.partition
if [ "$?" -eq "0" ]; then
get_fstype
do_mount
@@ -149,7 +150,7 @@
exit 1
fi
else
- dialog --backtitle "Kadischi User Data" --title "Kadischi user partition selection" --begin 12 40 --aspect 0 --shadow --msgbox "There was an error processing the arguments provided, bailing!" 8 70
+ dialog --backtitle "Kadischi User Data" --title "Kadischi user partition selection" --begin 6 9 --aspect 0 --shadow --msgbox "There was an error processing the arguments provided, bailing!" 8 70
do_cleanup
sleep 20
fi
@@ -210,16 +211,16 @@
esac
if [ -n "$DISK" ] && [ -n "$PARTITION" ] && [ -n "$FSTYPE" ]; then
umount /home
- mount -t $FSTYPE $DISK$PARTITION /home
+ mount -t $FSTYPE $PARTITION /home
if [ "$?" -eq "0" ]; then
- echo "Successfully mounted $DISK$PARTITION on /home as $FSTYPE!"
+ echo "Successfully mounted $PARTITION on /home as $FSTYPE!"
echo "If a non-root user doesn't already exist, create one now."
echo "Done! Please logout and back ins as your user."
do_cleanup
sleep 20
exit 0
else
- echo "There was an error processing your request to mount $DISK$PARTITION as $FSTYPE"
+ echo "There was an error processing your request to mount $PARTITION as $FSTYPE"
do_cleanup
sleep 20
exit 1
@@ -234,7 +235,7 @@
fi
else
if [ -x /usr/bin/dialog ]; then
- dialog --backtitle "Kadischi User Data" --begin 12 45 --aspect 0 --shadow --msgbox "You cannot run this application as non superuser (root)!" 6 60
+ dialog --backtitle "Kadischi User Data" --begin 6 9 --aspect 0 --shadow --msgbox "You cannot run this application as non superuser (root)!" 6 60
exit 0
else
echo "You cannot run this application as non superuser (root)!"
- Previous message: rpms/nexuiz-data/FC-4 .cvsignore, 1.4, 1.5 nexuiz-data.spec, 1.3, 1.4 sources, 1.4, 1.5
- Next message: rpms/nexuiz/FC-5 .cvsignore, 1.5, 1.6 nexuiz.spec, 1.11, 1.12 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list