Hey, So with this change, default mode is install or not install?
Peter > -----Original Message----- > From: [email protected] > [mailto:[email protected]] On Behalf Of itachi > Sent: Wednesday, July 06, 2011 2:35 AM > To: [email protected] > Cc: Yang, Chengwei > Subject: [meego-commits] 22278: Changes to > MeeGo:1.2:oss:Testing/installer-shell > > Hi, > I have made the following changes to installer-shell in project > MeeGo:1.2:oss:Testing. Please review and accept ASAP. > > Thank You, > itachi > > [This message was auto-generated] > > --- > > Request #22278: > > submit: > home:itachi:branches:MeeGo:1.2:oss:Testing/installer-shell(r2)(cleanup) -> > MeeGo:1.2:oss:Testing/installer-shell > > > Message: > * Wed Jul 06 2011 - Chengwei Yang <[email protected]> - 0.4 > - Fixed BMC#18705, automatically install > > State: new 2011-07-06T02:34:31 itachi > Comment: None > > > > changes files: > -------------- > --- installer-shell.changes > +++ installer-shell.changes > @@ -0,0 +1,3 @@ > +* Wed Jul 06 2011 - Chengwei Yang <[email protected]> - 0.4 > +- Fixed BMC#18705, automatically install > + > > new: > ---- > fix-automatically-start.patch > > spec files: > ----------- > --- installer-shell.spec > +++ installer-shell.spec > @@ -27,6 +27,7 @@ > Patch10: fix-space-calculation-and-cylinder-alignment.patch > Patch11: fix-install-mode-kboot.patch > Patch12: use-subvolrootid-and-subvol-insteadof-subvolid.patch > +Patch13: fix-automatically-start.patch > Requires: parted > Requires: dialog > Requires: rsync > @@ -80,6 +81,8 @@ > %patch11 -p1 > # use-subvolrootid-and-subvol-insteadof-subvolid.patch > %patch12 -p1 > +# fix-automatically-start.patch > +%patch13 -p1 > > # >> setup > # << setup > > other changes: > -------------- > > ++++++ fix-automatically-start.patch (new) > --- fix-automatically-start.patch > +++ fix-automatically-start.patch > +diff -Naru a/installer-shell b/installer-shell > +--- a/installer-shell 2011-07-06 16:39:23.682519217 +0800 > ++++ b/installer-shell 2011-07-06 17:15:20.813897110 +0800 > +@@ -13,7 +13,7 @@ > + VERSION="" > + IMAGE_TYPE="" > + USER_ANSWER=1 > +-SILENT_MODE= > ++SILENT_MODE=0 > + HAS_FACTORYPART=0 > + FACTORYPART= > + FACTORYPART_END_CYL=0 > +@@ -1078,29 +1078,27 @@ > + mkdir -p $OS_PROBE_ROOT_MOUNT > + mkdir -p $OS_PROBE_BOOT_MOUNT > + > +-check_and_choose_disk > +-wait_user "\033[31mDestroy all your data except the factory setting > partition on $(echo ${DISK_MENU[0]} |tr -s ' ' ' ') and install?\033[0m" > +-if [ $USER_ANSWER -eq 0 ]; then > +- SILENT_MODE=0 > +- choose_device > +- output "" > +- output "\033[31mWARNING:\033[0m" > +- output "" > +- output "You are going to install MeeGo. For this /dev/$DEV will be > formated" > +- output "which will cause all existing data on this disk to be lost." > +- output "" > +-elif [ $USER_ANSWER -eq 1 ]; then > ++cmdline=$(cat /proc/cmdline) > ++if strstr "$cmdline" " autoinst" ; then > + SILENT_MODE=1 > ++fi > ++check_and_choose_disk > ++if [ $SILENT_MODE -eq 1 ]; then > + if [ ! -b /dev/${DISK_ARRAY[0]} ]; then > + fail_exit "/dev/${DISK_ARRAY[0]} is not a block device." > + fi > + DEV=${DISK_ARRAY[0]} > + DEV_SIZE=$(($(sfdisk -s /dev/$DEV)/1024)) > +-else > +- fail_exit "Never should be here." > ++ wait_user "\033[31mDestroy all your data except the factory setting > partition on $(echo ${DISK_MENU[0]} |tr -s ' ' ' ') and install?\033[0m" > ++ if [ $USER_ANSWER -eq 0 ]; then > ++ SILENT_MODE=0 > ++ output "Go to advanced install mode." > ++ fi > ++fi > ++if [ $SILENT_MODE -eq 0 ]; then > ++ choose_device > + fi > + #check the image type > +-cmdline=$(cat /proc/cmdline) > + if strstr "$cmdline" liveimg || [ -e /dev/live-osimg ]; then > + IMAGE_TYPE="liveimg" > + else > > ++++++ installer-shell.yaml > --- installer-shell.yaml > +++ installer-shell.yaml > @@ -21,6 +21,7 @@ > - fix-space-calculation-and-cylinder-alignment.patch > - fix-install-mode-kboot.patch > - use-subvolrootid-and-subvol-insteadof-subvolid.patch > + - fix-automatically-start.patch > Description: | > A shell-script based installer which implements the installation process > in > silent mode > Requires: > > _______________________________________________ > MeeGo-commits mailing list > [email protected] > http://lists.meego.com/listinfo/meego-commits _______________________________________________ MeeGo-packaging mailing list [email protected] http://lists.meego.com/listinfo/meego-packaging
