Attachment 159768 Details for Bug 235141 – Updated chatttr -i cleanup patch for mock 0.7, tested with 0.7.4.

[patch] Updated chatttr -i cleanup patch for mock 0.7, tested with 0.7.4.

mock-0.7.1-chattr-i.patch (text/plain), 2.77 KB, created by Tuomo Soini on 2007-07-23 08:41:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tuomo Soini

Created: 2007-07-23 08:41:25 UTC

Size: 2.77 KB

patch

obsolete

>--- mock-0.7.1/mock.py.chattr	2007-06-14 20:01:44.000000000 +0300
>+++ mock-0.7.1/mock.py	2007-06-25 18:10:01.000000000 +0300
>@@ -199,9 +199,21 @@
>             (retval, output) = self.do(cmd)
> 
>             if retval != 0:
>-                error(output)
>                 if os.path.exists(self.rootdir):
>-                    raise RootError, "Failed to clean basedir, exiting"
>+                    cmd = '%s -R -i %s' % (self.config['chattr'], self.basedir)
>+                    (retval, output) = self.do(cmd)
>+
>+                    if retval != 0:
>+                        error(output)
>+                        raise RootError, "Failed to chattr basedir, exiting"
>+                    else:
>+                        cmd = '%s -rf %s' % (self.config['rm'], self.basedir)
>+                        (retval, output) = self.do(cmd)
>+
>+                        if retval != 0:
>+                            error(output)
>+                            if os.path.exists(self.rootdir):
>+                                raise RootError, "Failed to clean basedir, exiting"
> 
> 
>     def state(self, curstate=None):
>@@ -868,6 +880,7 @@
>     config_opts['mount'] = '/usr/sbin/mock-helper mount'
>     config_opts['umount'] = '/usr/sbin/mock-helper umount'
>     config_opts['rm'] = '/usr/sbin/mock-helper rm'
>+    config_opts['chattr'] = '/usr/sbin/mock-helper chattr'
>     config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
>     config_opts['yum'] = '/usr/sbin/mock-helper yum'
>     config_opts['chmod'] = '/usr/sbin/mock-helper chmod'
>--- mock-0.7.1/src/mock-helper.c.chattr	2007-06-14 20:01:44.000000000 +0300
>+++ mock-0.7.1/src/mock-helper.c	2007-06-25 18:10:01.000000000 +0300
>@@ -217,6 +217,32 @@
>  */
> 
> 
>+/* clean out a immutable bit from chroot dir */
>+void
>+do_chattr (int argc, char *argv[])
>+{
>+  /* enough arguments ? mock-helper chattr -R -i (rootdir), 5 */
>+  if (argc < 5)
>+    error ("not enough arguments");
>+
>+  /* check for too many arguments */
>+  if (argc > 5)
>+    error ("too many arguments");
>+
>+  /* see if we're doing chattr -R -i */
>+  if (strncmp ("-R", argv[2], 3) != 0)
>+    error ("%s: options not allowed", argv[2]);
>+
>+  if (strncmp ("-i", argv[3], 3) != 0)
>+    error ("%s: options not allowed", argv[3]);
>+
>+  /* see if we're doing -R -i on a dir under rootsdir */
>+  check_dir_allowed (rootsdir, argv[4]);
>+
>+  /* all checks passed, execute */
>+  do_command ("/usr/bin/chattr", &(argv[1]), 0);
>+}
>+
> void
> do_chroot (int argc, char *argv[])
> {
>@@ -492,7 +518,9 @@
>   if (argc < 2) usage ();
>   
>   /* see which command we are trying to run */
>-  if (strncmp ("chroot", argv[1], 6) == 0)
>+  if (strncmp ("chattr", argv[1], 6) == 0)
>+    do_chattr (argc, argv);
>+  else if (strncmp ("chroot", argv[1], 6) == 0)
>     do_chroot (argc, argv);
>   else if (strncmp ("mount", argv[1], 5) == 0)
>     do_mount (argc, argv);

Actions: View | Diff

Attachments on bug 235141: 151626 | 154583 | 159768 | 195791