1. photon
  2. Commit f58da80d9bfc97b1cd96ed2e55306e1753bc455d
Browse code

Use default options for root partition

Change-Id: Ia7e5fb9fcfad91d94fc0ed8198db245e4bf1082d
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1427
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Sharath George

Alexey Makhalov authored on 2016/09/21 14:33:54
Showing 3 changed files
installer/installer.py
History View file @ f58da80
... ... 
@@ -231,7 +231,6 @@ class Installer(object):
231 231 
             fsck = 2
232 232
233 233 
             if 'mountpoint' in partition and partition['mountpoint'] == '/':
234 
-                options = options + ',barrier,noatime,noacl,data=ordered'
235 234 
                 fsck = 1
236 235
237 236 
             if partition['filesystem'] == 'swap':
installer/ostreeinstaller.py
History View file @ f58da80
... ... 
@@ -155,7 +155,7 @@ class OstreeInstaller(Installer):
155 155
156 156
157 157 
         deployment_fstab = os.path.join(deployment, "etc/fstab")
158 
-        self.run("echo \"/dev/sda3    /        ext4   defaults,barrier,noatime,noacl,data=ordered 1 1  \" >> {} ".format(deployment_fstab), "Adding / mount point in fstab")
158 
+        self.run("echo \"/dev/sda3    /        ext4   defaults   1 1  \" >> {} ".format(deployment_fstab), "Adding / mount point in fstab")
159 159 
         self.run("echo \"/dev/sda2    /boot    ext4   defaults   1 2  \" >> {} ".format(deployment_fstab), "Adding /boot mount point in fstab")
160 160 
         self.run("mount --bind {} {}".format(deployment, self.photon_root))
161 161 
         self.progress_bar.update_loading_message("Starting post install modules")
support/cloud-image-builder/cloud-image-build.sh
History View file @ f58da80
... ... 
@@ -86,7 +86,7 @@ rm -f $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/etc/shadow-
86 86 
 rm -f $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/etc/machine-id
87 87 
 touch $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/etc/machine-id
88 88 
 rm -f $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/etc/fstab
89 
-echo "UUID=$UUID_VALUE    /    ext4    defaults,barrier,noatime,noacl,data=ordered 1 1" >> $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/etc/fstab
89 
+echo "UUID=$UUID_VALUE    /    ext4    defaults 1 1" >> $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/etc/fstab
90 90
91 91 
 mkdir -p $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/var/lib/cloud/seed/nocloud
92 92 
 cat << EOF >> $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/var/lib/cloud/seed/nocloud/meta-data