1. photon
  2. Commit 2be000ef7476d418fdeb629f3e62de0235fa3b1d
Browse code

Remove sync option from kpartx for cloud images and change kernel version

Change-Id: I895585d2b82dba1819eb5d9c05355e426810fc27
Reviewed-on: http://photon-jenkins.eng.vmware.com/783
Reviewed-by: suezzelur <anishs@vmware.com>
Tested-by: suezzelur <anishs@vmware.com>
(cherry picked from commit 0d9d4f5d14e4f416d87432683493aea51827c24b)
Reviewed-on: http://photon-jenkins.eng.vmware.com/872
Tested-by: jenkins-photon <wangnan2015@hotmail.com>

suezzelur authored on 2016/04/30 08:20:46
Showing 5 changed files
support/cloud-image-builder/cloud-image-build.sh
History View file @ 2be000e
... ... 
@@ -62,7 +62,7 @@ cd $BUILD_SCRIPTS_PATH
62 62 
 DISK_DEVICE=`losetup --show -f ${PHOTON_IMG_OUTPUT_PATH}/photon-${IMG_NAME}.raw`
63 63
64 64 
 echo "Mapping device partition to loop device"
65 
-kpartx -avs $DISK_DEVICE
65 
+kpartx -av $DISK_DEVICE
66 66
67 67 
 DEVICE_NAME=`echo $DISK_DEVICE|cut -c6- `
68 68
support/cloud-image-builder/gce/mk-setup-grub.sh
History View file @ 2be000e
... ... 
@@ -164,11 +164,11 @@ menuentry 'GNU/Linux' --class gnu-linux --class gnu --class os $menuentry_id_opt
164 164 
     else
165 165 
       search --no-floppy --fs-uuid --set=root UUID_PLACEHOLDER
166 166 
     fi
167 
-    echo    'Loading Linux 4.4.7 ...'
168 
-    linux   /boot/vmlinuz-4.4.7 root=/dev/sda2 ro console=ttyS0,38400n8
167 
+    echo    'Loading Linux 4.2.0 ...'
168 
+    linux   /boot/vmlinuz-4.2.0 root=/dev/sda2 ro console=ttyS0,38400n8
169 169 
 }
170 170 
 submenu 'Advanced options for GNU/Linux' $menuentry_id_option 'gnulinux-advanced-UUID_PLACEHOLDER' {
171 
-    menuentry 'GNU/Linux, with Linux 4.4.7' --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-4.4.7-advanced-UUID_PLACEHOLDER' {
171 
+    menuentry 'GNU/Linux, with Linux 4.2.0' --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-4.2.0-advanced-UUID_PLACEHOLDER' {
172 172 
         load_video
173 173 
         set gfxpayload=keep
174 174 
         insmod gzio
... ... 
@@ -180,10 +180,10 @@ submenu 'Advanced options for GNU/Linux' $menuentry_id_option 'gnulinux-advanced
180 180 
         else
181 181 
           search --no-floppy --fs-uuid --set=root UUID_PLACEHOLDER
182 182 
         fi
183 
-        echo    'Loading Linux 4.4.7 ...'
184 
-        linux   /boot/vmlinuz-4.4.7 root=/dev/sda2 ro console=ttyS0,38400n8
183 
+        echo    'Loading Linux 4.2.0 ...'
184 
+        linux   /boot/vmlinuz-4.2.0 root=/dev/sda2 ro console=ttyS0,38400n8
185 185 
     }
186 
-    menuentry 'GNU/Linux, with Linux 4.4.7 (recovery mode)' --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-4.4.7-recovery-UUID_PLACEHOLDER' {
186 
+    menuentry 'GNU/Linux, with Linux 4.2.0 (recovery mode)' --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-4.2.0-recovery-UUID_PLACEHOLDER' {
187 187 
         load_video
188 188 
         set gfxpayload=keep
189 189 
         insmod gzio
... ... 
@@ -195,8 +195,8 @@ submenu 'Advanced options for GNU/Linux' $menuentry_id_option 'gnulinux-advanced
195 195 
         else
196 196 
           search --no-floppy --fs-uuid --set=root UUID_PLACEHOLDER
197 197 
         fi
198 
-        echo    'Loading Linux 4.4.7 ...'
199 
-        linux   /boot/vmlinuz-4.4.7 root=/dev/sda2 ro single console=ttyS0,38400n8
198 
+        echo    'Loading Linux 4.2.0 ...'
199 
+        linux   /boot/vmlinuz-4.2.0 root=/dev/sda2 ro single console=ttyS0,38400n8
200 200 
     }
201 201 
 }
202 202
support/cloud-image-builder/mk-setup-grub.sh
History View file @ 2be000e
... ... 
@@ -112,7 +112,7 @@ set theme=/boot/grub2/themes/photon/theme.txt
112 112 
 menuentry "Photon" {
113 113 
 	insmod ext2
114 114 
     insmod part_gpt
115 
-	linux /boot/vmlinuz-4.4.7 init=/lib/systemd/systemd root=UUID=UUID_PLACEHOLDER loglevel=7 ro
115 
+	linux /boot/vmlinuz-4.2.0 init=/lib/systemd/systemd root=UUID=UUID_PLACEHOLDER loglevel=7 ro
116 116 
 	initrd /boot/initrd.img-no-kmods
117 117 
 }
118 118 
 # End /boot/grub2/grub.cfg
support/cloud-image-builder/mk-setup-vmdk.sh
History View file @ 2be000e
... ... 
@@ -89,7 +89,7 @@ fi
89 89 
 sgdisk -t1:ef02 $DISK_DEVICE >> $LOGFILE
90 90
91 91 
 echo "Mapping device partition to loop device"
92 
-kpartx -avs $DISK_DEVICE >> $LOGFILE
92 
+kpartx -av $DISK_DEVICE >> $LOGFILE
93 93
94 94 
 DEVICE_NAME=`echo $DISK_DEVICE|cut -c6- `
95 95
support/cloud-image-builder/ova/mk-ova-image.sh
History View file @ 2be000e
... ... 
@@ -45,7 +45,7 @@ mv $PHOTON_IMG_OUTPUT_PATH/temp/photon-ova-hw10-$PHOTON_RELEASE_VER-$PHOTON_BUIL
45 45 
 cd $PHOTON_IMG_OUTPUT_PATH
46 46 
 rm -rf photon-custom
47 47 
 DISK_DEVICE=`losetup --show -f ${PHOTON_IMG_OUTPUT_PATH}/photon-ova.raw`
48 
-kpartx -avs $DISK_DEVICE
48 
+kpartx -av $DISK_DEVICE
49 49
50 50 
 DEVICE_NAME=`echo $DISK_DEVICE|cut -c6- `
51 51