Fix cleanup_userdata sysprep

[snf-image-creator] / image_creator / os_type / linux.py

diff --git a/image_creator/os_type/linux.py b/image_creator/os_type/linux.py
index 9a54eeb..91f6910 100644 (file)
--- a/image_creator/os_type/linux.py
+++ b/image_creator/os_type/linux.py
@@ -50,10 +50,10 @@ class Linux(Unix):
         if dev in self._uuid:
             return self._uuid[dev]
 
         if dev in self._uuid:
             return self._uuid[dev]
 

-        for attr in self.g.blkid(dev):
-            if attr[0] == 'UUID':
-                self._uuid[dev] = attr[1]
-                return attr[1]
+        uuid = self.g.vfs_uuid(dev)
+        assert len(uuid)
+        self._uuid[dev] = uuid
+        return uuid

 
     @sysprep()
     def fix_acpid(self, print_header=True):
 
     @sysprep()
     def fix_acpid(self, print_header=True):

@@ -65,7 +65,7 @@ class Linux(Unix):
             self.out.output('Fixing acpid powerdown action')
 
         powerbtn_action = '#!/bin/sh\n\nPATH=/sbin:/bin:/usr/bin\n' \
             self.out.output('Fixing acpid powerdown action')
 
         powerbtn_action = '#!/bin/sh\n\nPATH=/sbin:/bin:/usr/bin\n' \

-                                'shutdown -h now \"Power button pressed\"\n'
+                          'shutdown -h now "Power button pressed"\n'

 
         events_dir = '/etc/acpi/events'
         if not self.g.is_dir(events_dir):
 
         events_dir = '/etc/acpi/events'
         if not self.g.is_dir(events_dir):

@@ -95,26 +95,27 @@ class Linux(Unix):
                 if action:
                     if not self.g.is_file(action):
                         self.out.warn("Acpid action file: %s does not exist" %
                 if action:
                     if not self.g.is_file(action):
                         self.out.warn("Acpid action file: %s does not exist" %

-                                                                        action)
+                                      action)

                         return
                         return

-                    self.g.copy_file_to_file(action, \
-                      "%s.orig.snf-image-creator-%d" % (action, time.time()))
+                    self.g.copy_file_to_file(action,
+                                             "%s.orig.snf-image-creator-%d" %
+                                             (action, time.time()))

                     self.g.write(action, powerbtn_action)
                     return
                 else:
                     self.g.write(action, powerbtn_action)
                     return
                 else:

-                    self.out.warn(
-                            "Acpid event file %s does not contain and action")
+                    self.out.warn("Acpid event file %s does not contain and "
+                                  "action")

                     return
             elif event.strip() == ".*":
                     return
             elif event.strip() == ".*":

-                self.out.warn(
-                    "Found action `.*'. Don't know how to handle this. " \
-                    "Please edit \%s' image file manually to make the " \
-                    "system immediatelly shutdown when an power button acpi " \
-                    "event occures" % action)
+                self.out.warn("Found action `.*'. Don't know how to handle "
+                              "this. Please edit `%s' image file manually to "
+                              "make the system immediatelly shutdown when an "
+                              "power button acpi event occures." %
+                              action.strip().split()[0])

                 return
 
     @sysprep()
                 return
 
     @sysprep()

-    def persistent_net_rules(self, print_header=True):
+    def remove_persistent_net_rules(self, print_header=True):

         """Remove udev rules that will keep network interface names persistent
         after hardware changes and reboots. Those rules will be created again
         the next time the image runs.
         """Remove udev rules that will keep network interface names persistent
         after hardware changes and reboots. Those rules will be created again
         the next time the image runs.

@@ -151,14 +152,14 @@ class Linux(Unix):
         self.g.write('/etc/fstab', new_fstab)
 
     @sysprep()
         self.g.write('/etc/fstab', new_fstab)
 
     @sysprep()

-    def persistent_devs(self, print_header=True):
+    def use_persistent_block_device_names(self, print_header=True):

         """Scan fstab & grub configuration files and replace all non-persistent
         device appearences with UUIDs.
         """
 
         if print_header:
         """Scan fstab & grub configuration files and replace all non-persistent
         device appearences with UUIDs.
         """
 
         if print_header:

-            self.out.output(
-                    'Replacing fstab & grub non-persistent device appearences')
+            self.out.output("Replacing fstab & grub non-persistent device "
+                            "appearences")

 
         # convert all devices in fstab to persistent
         persistent_root = self._persistent_fstab()
 
         # convert all devices in fstab to persistent
         persistent_root = self._persistent_fstab()