vzctl-pld.patch

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