Attachment 154583 Details for Bug 235141 – Improved patch to add chattr -i run

[patch] Improved patch to add chattr -i run

mock-0.6.13-chattr-i.patch (text/plain), 3.37 KB, created by Tuomo Soini on 2007-05-12 07:35:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tuomo Soini

Created: 2007-05-12 07:35:59 UTC

Size: 3.37 KB

patch

obsolete

>--- mock-0.6.13/mock.py.chattr	2007-02-20 18:21:49.000000000 +0200
>+++ mock-0.6.13/mock.py	2007-05-08 15:19:14.000000000 +0300
>@@ -194,9 +194,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):
>@@ -795,6 +807,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['runuser'] = '/sbin/runuser'
>--- mock-0.6.13/src/mock-helper.c.chattr	2006-06-09 00:28:47.000000000 +0300
>+++ mock-0.6.13/src/mock-helper.c	2007-05-08 15:05:28.000000000 +0300
>@@ -190,6 +190,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[])
> {
>@@ -429,7 +455,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);
>--- mock-0.6.13/mock.spec.chattr	2007-02-20 18:23:28.000000000 +0200
>+++ mock-0.6.13/mock.spec	2007-05-08 15:05:28.000000000 +0300
>@@ -1,13 +1,14 @@
> Summary: Builds packages inside chroots
> Name: mock
> Version: 0.6.13
>-Release: 1%{?dist}
>+Release: 2%{?dist}
> License: GPL
> Group: Development/Tools
> Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz
> URL: http://fedoraproject.org/wiki/Projects/Mock
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> Requires: python, yum >= 3.0
>+Requires: e2fsprogs
> Requires(pre): shadow-utils
> BuildRequires: libselinux-devel
>

Actions: View | Diff

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