vzctl-pld.patch

   1 diff -ru vzctl-4.0/bin/Makefile.am vzctl-4.0-patched/bin/Makefile.am
   2 --- vzctl-4.0/bin/Makefile.am   2012-09-25 16:53:24.000000000 +0200
   3 +++ vzctl-4.0-patched/bin/Makefile.am   2012-10-27 17:30:19.150478764 +0200
   4 @@ -49,6 +49,27 @@
   5                 echo " ***************************************************"; \
   6                 echo; \
   7         fi
   8 +install-pld-from-spec:
   9 +
  10 +install-pld:
  11 +       @if [ ! -e "$(DESTDIR)/sbin/ifup-local" -a \
  12 +                       ! -L "$(DESTDIR)/sbin/ifup-local" ]; then \
  13 +               $(MKDIR_P) "$(DESTDIR)/sbin"; \
  14 +               $(LN_S) "..$(sbindir)/vzifup-post" \
  15 +                       "$(DESTDIR)/sbin/ifup-local"; \
  16 +       elif readlink "$(DESTDIR)/sbin/ifup-local" | \
  17 +                       fgrep -q vzifup-post; then \
  18 +               true; \
  19 +       else \
  20 +               echo; \
  21 +               echo " ***************************************************"; \
  22 +               echo " WARNING: file $(DESTDIR)/sbin/ifup-local is present!"; \
  23 +               echo " You have to manually edit the above file so that "; \
  24 +               echo " it calls $(sbindir)/vzifup-post"; \
  25 +               echo " ***************************************************"; \
  26 +               echo; \
  27 +       fi
  28 +
  29
  30
  31  install-suse:
  32 Tylko w vzctl-4.0-patched/bin: Makefile.am.orig
  33 diff -ru vzctl-4.0/etc/dists/Makefile.am vzctl-4.0-patched/etc/dists/Makefile.am
  34 --- vzctl-4.0/etc/dists/Makefile.am     2012-09-25 16:53:23.000000000 +0200
  35 +++ vzctl-4.0-patched/etc/dists/Makefile.am     2012-10-27 17:30:19.150478764 +0200
  36 @@ -75,6 +75,9 @@
  37  funtoo:
  38         $(INSTALL_DATA) $(srcdir)/funtoo.conf $(DESTDIR)$(distconfdir)/funtoo.conf
  39
  40 +pld:
  41 +       $(INSTALL_DATA) $(srcdir)/pld.conf $(DESTDIR)$(distconfdir)/pld.conf
  42 +
  43  gentoo:
  44         $(INSTALL_DATA) $(srcdir)/gentoo.conf \
  45                 $(DESTDIR)$(distconfdir)/gentoo.conf
  46 @@ -142,6 +145,7 @@
  47                     debian \
  48                     fedora \
  49                     funtoo \
  50 +                   pld \
  51                     gentoo \
  52                     mandrake \
  53                     owl \
  54 Tylko w vzctl-4.0-patched/etc/dists: Makefile.am.orig
  55 diff -ru vzctl-4.0/etc/init.d/initd-functions.in vzctl-4.0-patched/etc/init.d/initd-functions.in
  56 --- vzctl-4.0/etc/init.d/initd-functions.in     2012-09-25 16:53:23.000000000 +0200
  57 +++ vzctl-4.0-patched/etc/init.d/initd-functions.in     2012-10-27 17:30:19.151478423 +0200
  58 @@ -16,9 +16,12 @@
  59
  60  # Source function library.
  61  if [ -r /etc/init.d/functions ]; then
  62 -       . /etc/init.d/functions
  63         if [ -r /etc/redhat-release ] || [ -r /etc/centos-release ]; then
  64 +               . /etc/init.d/functions
  65                 DISTR=redhat
  66 +       elif [ -r /etc/pld-release ]; then
  67 +               . /etc/init.d/functions
  68 +               DISTR=pld
  69         fi
  70  elif [ -r /etc/rc.status ]; then
  71         . /etc/rc.status
  72 @@ -34,6 +37,8 @@
  73  {
  74         if [ "$DISTR" = "redhat" ]; then
  75                 echo_success
  76 +       elif [ "$DISTR" = "pld" ]; then
  77 +               ok
  78         else
  79                 echo -n "$rc_done"
  80         fi
  81 @@ -42,9 +47,10 @@
  82
  83  print_failure()
  84  {
  85 -       echo -n "$1"
  86         if [ "$DISTR" = "redhat" ]; then
  87                 failure $"$1"
  88 +       elif [ "$DISTR" = "pld" ]; then
  89 +               fail
  90         else
  91                 echo -n "$rc_failed"
  92         fi
  93 @@ -56,6 +62,8 @@
  94         if [ "$DISTR" = "redhat" ]; then
  95                 echo -n "$1"
  96                 warning $"$1"
  97 +       elif [ "$DISTR" = "pld" ]; then
  98 +               nls -n "$1"
  99         else
 100                 echo -n "- Warning: $1 "
 101         fi
 102 @@ -67,15 +75,23 @@
 103  print_result()
 104  {
 105         if [ $? -eq 0 ] ; then
 106 -               print_success
 107 +               if [ "$DISTR" = "pld" ]; then
 108 +                       ok
 109 +               else
 110 +                       print_success
 111 +               fi
 112         else
 113 -               print_failure "$1"
 114 +               if  [ "$DISTR" = "pld" ]; then
 115 +                       fail
 116 +               else
 117 +                       print_failure "$1"
 118 +               fi
 119         fi
 120  }
 121
 122  __echo()
 123  {
 124 -       if [ "$DISTR" = "redhat" ]; then
 125 +       if [ "$DISTR" = "redhat" ] || [ "$DISTR" = "pld" ]; then
 126                 echo -n $"$1"
 127         else
 128                 echo -n "$1"
 129 @@ -93,7 +109,7 @@
 130  vzdaemon_start()
 131  {
 132         case $DISTR in
 133 -          redhat)
 134 +          redhat|pld)
 135                 daemon $*
 136                 ;;
 137            suse)
 138 @@ -110,7 +126,7 @@
 139  vzdaemon_stop()
 140  {
 141         case $DISTR in
 142 -          redhat|suse)
 143 +          redhat|suse|pld)
 144                 killproc $*
 145                 ;;
 146            debian)
 147 @@ -127,7 +143,7 @@
 148         shift
 149
 150         case $DISTR in
 151 -          redhat|suse)
 152 +          redhat|suse|pld)
 153                 status $p
 154                 ;;
 155            debian)
 156 Tylko w vzctl-4.0-patched/etc/init.d: initd-functions.in.orig
 157 diff -ru vzctl-4.0/etc/init.d/Makefile.am vzctl-4.0-patched/etc/init.d/Makefile.am
 158 --- vzctl-4.0/etc/init.d/Makefile.am    2012-09-25 16:53:23.000000000 +0200
 159 +++ vzctl-4.0-patched/etc/init.d/Makefile.am    2012-10-27 17:32:07.083190799 +0200
 160 @@ -15,7 +15,7 @@
 161  #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 162  #
 163
 164 -INITSCRIPTS = vz-redhat vz-gentoo vzeventd-redhat vzeventd-gentoo
 165 +INITSCRIPTS = vz-redhat vz-gentoo vzeventd-redhat vzeventd-gentoo vz-pld vzeventd-pld
 166  script_DATA = initd-functions
 167
 168  EXTRA_DIST = $(INITSCRIPTS:%=%.in) $(script_DATA:%=%.in)
 169 @@ -29,6 +29,12 @@
 170         $(INSTALL_SCRIPT) vz-redhat $(DESTDIR)$(initddir)/vz
 171         $(INSTALL_SCRIPT) vzeventd-redhat $(DESTDIR)$(initddir)/vzeventd
 172
 173 +install-pld: vz-pld vzeventd-pld
 174 +       $(mkinstalldirs) $(DESTDIR)$(initddir)
 175 +       $(INSTALL_SCRIPT) vz-pld $(DESTDIR)$(initddir)/vz
 176 +       $(INSTALL_SCRIPT) vzeventd-pld $(DESTDIR)$(initddir)/vzeventd
 177 +
 178 +
 179  install-suse: install-redhat
 180
 181  install-debian: install-redhat
 182 diff -ru vzctl-4.0/etc/Makefile.am vzctl-4.0-patched/etc/Makefile.am
 183 --- vzctl-4.0/etc/Makefile.am   2012-09-25 16:53:23.000000000 +0200
 184 +++ vzctl-4.0-patched/etc/Makefile.am   2012-10-27 17:30:19.151478423 +0200
 185 @@ -34,6 +34,11 @@
 186  install-data-local:
 187         $(mkinstalldirs) $(DESTDIR)$(namesdir)
 188
 189 +install-pld-from-spec: install-pld
 190 +install-pld:
 191 +       $(MAKE) $(AM_MAKEFLAGS) -C init.d $@
 192 +       $(MAKE) $(AM_MAKEFLAGS) -C network-scripts $@
 193 +
 194  install-redhat-from-spec: install-redhat
 195  install-redhat:
 196         $(MAKE) $(AM_MAKEFLAGS) -C init.d $@
 197 diff -ru vzctl-4.0/etc/network-scripts/Makefile.am vzctl-4.0-patched/etc/network-scripts/Makefile.am
 198 --- vzctl-4.0/etc/network-scripts/Makefile.am   2012-09-25 16:53:23.000000000 +0200
 199 +++ vzctl-4.0-patched/etc/network-scripts/Makefile.am   2012-10-27 17:30:19.152478519 +0200
 200 @@ -38,3 +38,11 @@
 201         for file in $(NETSDATA); do \
 202                 $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(netsdir)/$$file; \
 203         done
 204 +install-pld: $(NETSSCRIPTS)
 205 +       $(mkinstalldirs) $(DESTDIR)$(netsdir)
 206 +       for file in $(NETSSCRIPTS); do \
 207 +               $(INSTALL_SCRIPT) $$file $(DESTDIR)$(netsdir)/$$file; \
 208 +       done
 209 +       for file in $(NETSDATA); do \
 210 +               $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(netsdir)/$$file; \
 211 +       done
 212 diff -ru vzctl-4.0/Makefile.am vzctl-4.0-patched/Makefile.am
 213 --- vzctl-4.0/Makefile.am       2012-09-25 16:53:23.000000000 +0200
 214 +++ vzctl-4.0-patched/Makefile.am       2012-10-27 17:30:19.152478519 +0200
 215 @@ -47,6 +47,7 @@
 216         $(mkinstalldirs) $(DESTDIR)$(modulesdir)
 217
 218  DISTRO_TARGETS = \
 219 +       install-pld \
 220         install-redhat \
 221         install-gentoo \
 222         install-suse \
 223 @@ -54,7 +55,8 @@
 224
 225  DISTRO_TARGETS_ALL = \
 226         $(DISTRO_TARGETS) \
 227 -       install-redhat-from-spec
 228 +       install-redhat-from-spec \
 229 +       install-pld-from-spec
 230
 231  $(DISTRO_TARGETS_ALL):
 232         $(MAKE) $(AM_MAKEFLAGS) -C etc $@