Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/vzctl/patches/vzctl-3.0.18-magellan.patch

    Diff of /trunk/vzctl/patches/vzctl-3.0.18-magellan.patch

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 274 by niro, Sat Jul 21 22:55:33 2007 UTC revision 275 by niro, Sat Jul 21 23:05:25 2007 UTC
    # Line 29  diff -Naur vzctl-3.0.18/etc/dists/magell Line 29  diff -Naur vzctl-3.0.18/etc/dists/magell
    29  +SET_USERPASS=set_userpass.sh  +SET_USERPASS=set_userpass.sh
    30  +SET_UGID_QUOTA=magellan-set_ugid_quota.sh  +SET_UGID_QUOTA=magellan-set_ugid_quota.sh
    31  +POST_CREATE=postcreate.sh  +POST_CREATE=postcreate.sh
    32    diff -Naur vzctl-3.0.18/etc/dists/Makefile.am vzctl-3.0.18-magellan/etc/dists/Makefile.am
    33    --- vzctl-3.0.18/etc/dists/Makefile.am 2007-07-06 09:46:25.000000000 +0200
    34    +++ vzctl-3.0.18-magellan/etc/dists/Makefile.am 2007-07-22 01:01:21.000000000 +0200
    35    @@ -69,6 +69,9 @@
    36     gentoo:
    37     $(INSTALL_DATA) $(srcdir)/gentoo.conf $(DESTDIR)$(distconfdir)/gentoo.conf
    38    
    39    +magellan:
    40    + $(INSTALL_DATA) $(srcdir)/magellan.conf $(DESTDIR)$(distconfdir)/magellan.conf
    41    +
    42     mandrake:
    43     $(INSTALL_DATA) $(srcdir)/mandrake.conf $(DESTDIR)$(distconfdir)/mandrake.conf
    44    
    45    @@ -141,6 +144,7 @@
    46                        debian \
    47                        fc \
    48                        gentoo \
    49    +                   magellan \
    50                        mandrake \
    51                        redhat \
    52                        rhel \
    53    diff -Naur vzctl-3.0.18/etc/dists/Makefile.in vzctl-3.0.18-magellan/etc/dists/Makefile.in
    54    --- vzctl-3.0.18/etc/dists/Makefile.in 2007-07-06 09:46:34.000000000 +0200
    55    +++ vzctl-3.0.18-magellan/etc/dists/Makefile.in 2007-07-22 01:01:55.000000000 +0200
    56    @@ -477,6 +477,9 @@
    57     gentoo:
    58     $(INSTALL_DATA) $(srcdir)/gentoo.conf $(DESTDIR)$(distconfdir)/gentoo.conf
    59    
    60    +magellan:
    61    + $(INSTALL_DATA) $(srcdir)/magellan.conf $(DESTDIR)$(distconfdir)/magellan.conf
    62    +
    63     mandrake:
    64     $(INSTALL_DATA) $(srcdir)/mandrake.conf $(DESTDIR)$(distconfdir)/mandrake.conf
    65    
    66    @@ -549,6 +552,7 @@
    67                        debian \
    68                        fc \
    69                        gentoo \
    70    +                   magellan \
    71                        mandrake \
    72                        redhat \
    73                        rhel \
    74  diff -Naur vzctl-3.0.18/etc/dists/scripts/magellan-add_ip.sh vzctl-3.0.18-magellan/etc/dists/scripts/magellan-add_ip.sh  diff -Naur vzctl-3.0.18/etc/dists/scripts/magellan-add_ip.sh vzctl-3.0.18-magellan/etc/dists/scripts/magellan-add_ip.sh
    75  --- vzctl-3.0.18/etc/dists/scripts/magellan-add_ip.sh 1970-01-01 01:00:00.000000000 +0100  --- vzctl-3.0.18/etc/dists/scripts/magellan-add_ip.sh 1970-01-01 01:00:00.000000000 +0100
    76  +++ vzctl-3.0.18-magellan/etc/dists/scripts/magellan-add_ip.sh 2007-07-22 00:45:06.000000000 +0200  +++ vzctl-3.0.18-magellan/etc/dists/scripts/magellan-add_ip.sh 2007-07-22 00:45:06.000000000 +0200
    # Line 401  diff -Naur vzctl-3.0.18/etc/init.d/vz-ma Line 443  diff -Naur vzctl-3.0.18/etc/init.d/vz-ma
    443  +++ vzctl-3.0.18-magellan/etc/init.d/vz-magellan.in 2007-07-22 00:44:28.000000000 +0200  +++ vzctl-3.0.18-magellan/etc/init.d/vz-magellan.in 2007-07-22 00:44:28.000000000 +0200
    444  @@ -0,0 +1,405 @@  @@ -0,0 +1,405 @@
    445  +#!/bin/bash  +#!/bin/bash
    446  +# $Header: /root/magellan-cvs/src/vzctl/patches/vzctl-3.0.18-magellan.patch,v 1.2 2007-07-21 22:55:33 niro Exp $  +# $Header: /root/magellan-cvs/src/vzctl/patches/vzctl-3.0.18-magellan.patch,v 1.3 2007-07-21 23:05:25 niro Exp $
    447  +  +
    448  +#%rlevels: 3:s 4:s 5:s 0:k 1:k 2:k 6:k  +#%rlevels: 3:s 4:s 5:s 0:k 1:k 2:k 6:k
    449  +#%start: 96  +#%start: 96
    # Line 805  diff -Naur vzctl-3.0.18/etc/init.d/vz-ma Line 847  diff -Naur vzctl-3.0.18/etc/init.d/vz-ma
    847  + exit 1  + exit 1
    848  + ;;  + ;;
    849  +esac  +esac
    850    diff -Naur vzctl-3.0.18/etc/Makefile.am vzctl-3.0.18-magellan/etc/Makefile.am
    851    --- vzctl-3.0.18/etc/Makefile.am 2007-07-06 09:46:25.000000000 +0200
    852    +++ vzctl-3.0.18-magellan/etc/Makefile.am 2007-07-22 00:58:59.000000000 +0200
    853    @@ -48,3 +48,8 @@
    854     $(MAKE) $(AM_MAKEFLAGS) -C init.d $@
    855     $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/conf.d
    856     $(LN_S) $(pkgconfdir)/vz.conf $(DESTDIR)$(sysconfdir)/conf.d/vz
    857    +
    858    +install-magellan:
    859    + $(MAKE) $(AM_MAKEFLAGS) -C init.d $@
    860    + $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/conf.d
    861    + $(LN_S) $(pkgconfdir)/vz.conf $(DESTDIR)$(sysconfdir)/conf.d/vz
    862    diff -Naur vzctl-3.0.18/etc/Makefile.in vzctl-3.0.18-magellan/etc/Makefile.in
    863    --- vzctl-3.0.18/etc/Makefile.in 2007-07-06 09:46:33.000000000 +0200
    864    +++ vzctl-3.0.18-magellan/etc/Makefile.in 2007-07-22 00:59:26.000000000 +0200
    865    @@ -567,6 +567,12 @@
    866     $(MAKE) $(AM_MAKEFLAGS) -C init.d $@
    867     $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/conf.d
    868     $(LN_S) $(pkgconfdir)/vz.conf $(DESTDIR)$(sysconfdir)/conf.d/vz
    869    +
    870    +install-magellan:
    871    + $(MAKE) $(AM_MAKEFLAGS) -C init.d $@
    872    + $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/conf.d
    873    + $(LN_S) $(pkgconfdir)/vz.conf $(DESTDIR)$(sysconfdir)/conf.d/vz
    874    +
    875     # Tell versions [3.59,3.63) of GNU make to not export all variables.
    876     # Otherwise a system limit (for SysV at least) may be exceeded.
    877     .NOEXPORT:
    878    diff -Naur vzctl-3.0.18/INSTALL vzctl-3.0.18-magellan/INSTALL
    879    --- vzctl-3.0.18/INSTALL 2007-07-06 09:46:25.000000000 +0200
    880    +++ vzctl-3.0.18-magellan/INSTALL 2007-07-22 01:03:48.000000000 +0200
    881    @@ -15,7 +15,7 @@
    882     # make install
    883     # make install-<distro>
    884    
    885    -Here <distro> can be one of: redhat, suse, gentoo, debian.
    886    +Here <distro> can be one of: redhat, suse, gentoo, magellan, debian.
    887    
    888    
    889     == Complete instructions ==
    890    @@ -78,6 +78,7 @@
    891     To that effect, run one of the following:
    892    
    893     make install-gentoo # for Gentoo
    894    + make install-magellan # for Magellan
    895     make install-redhat # for Red Hat, CentOS, and Fedora
    896     make install-suse # for openSUSE and SLES
    897     make install-debian # for Debian and Ubuntu
    898  diff -Naur vzctl-3.0.18/Makefile.am vzctl-3.0.18-magellan/Makefile.am  diff -Naur vzctl-3.0.18/Makefile.am vzctl-3.0.18-magellan/Makefile.am
    899  --- vzctl-3.0.18/Makefile.am 2007-07-06 09:46:25.000000000 +0200  --- vzctl-3.0.18/Makefile.am 2007-07-06 09:46:25.000000000 +0200
    900  +++ vzctl-3.0.18-magellan/Makefile.am 2007-07-22 00:54:26.000000000 +0200  +++ vzctl-3.0.18-magellan/Makefile.am 2007-07-22 00:54:26.000000000 +0200
    Legend:
    Removed from v.274  
    changed lines
      Added in v.275