Changeset 1111 in ProjectBuilder for devel/rpmbootstrap

Timestamp:

Nov 18, 2010, 2:06:01 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Rename previous option osupd into the more correct osins, and add a real osupd param to support distribution update commands
• Adds 2 new commands to update distributions in VM|VE with updatevm|ve (Fix #70)

File:

• devel/rpmbootstrap/bin/rpmbootstrap (modified) (11 diffs)

devel/rpmbootstrap/bin/rpmbootstrap

@@ -216 +216 @@
 my ($name,$ver,$darch) = split(/-/,$ENV{'PBV'});
 chomp($darch);
-my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd) = pb_distro_init($name,$ver,$darch);
+my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $pbins) = pb_distro_init($name,$ver,$darch);
 
 #
@@ -282 +282 @@
 my $repo = $mirror;
 my $found = 0;
-if ($pbupd =~ /yum/) {
+if ($pbins =~ /yum/) {
     my $response1;
     while ($found == 0) {
@@ -334 +334 @@
 my $osupdname = "";
 
-if ($pbupd =~ /yum/) {
+if ($pbins =~ /yum/) {
     $oscachedir = "$vepath/var/cache/yum/core/packages/";
     $osupdcachedir = "$vepath/var/cache/yum/updates-released/packages/";
@@ -344 +344 @@
         $osupdcachedir = "$vepath/var/cache/yum/updates-released/packages/";
     }
-} elsif ($pbupd =~ /zypper/) {
+} elsif ($pbins =~ /zypper/) {
     $oscachedir = "$vepath/var/cache/zypp/packages/opensuse/suse/$darch";
     $osupdname = "Zypper";
-} elsif ($pbupd =~ /urpmi/) {
+} elsif ($pbins =~ /urpmi/) {
     $oscachedir = "$vepath/var/cache/urpmi/rpms";
     $osupdname = "URPMI";
@@ -418 +418 @@
 
 # yum needs that distro-release package be installed, so force it
-if ($pbupd =~ /yum/) {
+if ($pbins =~ /yum/) {
     foreach my $p1 (<$cachedir/($ddir|redhat)-release-*.rpm>) {
         copy("$cachedir/$p1","$vepath/tmp");
@@ -461 +461 @@
 
 pb_log(1,"Adapting $osupdname repository entries\n");
-if ($pbupd =~ /yum/) {
+if ($pbins =~ /yum/) {
     #
     # Force the architecture for yum
@@ -478 +478 @@
     }
     $minipkglist = "ldconfig yum passwd vim-minimal dhclient authconfig";
-} elsif ($pbupd =~ /zypper/) {
+} elsif ($pbins =~ /zypper/) {
     pb_mkdir_p("$vepath/etc/zypp/repos.d");
     open(REPO,"> $vepath/etc/zypp/repos.d/$ddir-$dver") || die "Unable to create repo file";
@@ -497 +497 @@
         pb_system("chroot $vepath /bin/bash -c \"yes | /usr/bin/zypper sa $baseurl $ddir-$dver\"","Bootstrapping Zypper");
     }
-} elsif ($pbupd =~ /urpmi/) {
+} elsif ($pbins =~ /urpmi/) {
     # Setup the repo
     my $baseurl = dirname(dirname(dirname($mirror)));
@@ -508 +508 @@
 # No need for sudo here
 #
-$pbupd =~ s/sudo//g;
-pb_system("chroot $vepath /bin/bash -c \"$pbupd $minipkglist \"","Bootstrapping OS by running $pbupd $minipkglist");
+$pbins =~ s/sudo//g;
+pb_system("chroot $vepath /bin/bash -c \"$pbins $minipkglist \"","Bootstrapping OS by running $pbins $minipkglist");
 
 #
@@ -520 +520 @@
 if (defined $opts{'a'}) {
     $opts{'a'} =~ s/,/ /g;
-    pb_system("chroot $vepath /bin/bash -c \"$pbupd $opts{'a'} \"","Adding packages to OS by running $pbupd $opts{'a'}");
+    pb_system("chroot $vepath /bin/bash -c \"$pbins $opts{'a'} \"","Adding packages to OS by running $pbins $opts{'a'}");
 }
 
@@ -527 +527 @@
 #
 pb_log(1,"Cleaning up\n");
-if ($pbupd =~ /yum/) {
+if ($pbins =~ /yum/) {
     pb_system("chroot $vepath /usr/bin/yum clean all","Cleaning yum");
 }