Changeset 1533 in ProjectBuilder

Timestamp:

May 13, 2012, 4:42:10 AM (12 years ago)

Author:

Bruno Cornec

Message:

• rpmbootstrap: If we have a proxy defined, write it into /etc/sysconfig/proxy. Otherwise one of the opensuse's doesn't work right. Various hacks to keep the redhat distros from destroying the nis name of the machine during the install (in comment). (Eric Anderson)

File:

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

devel/rpmbootstrap/bin/rpmbootstrap

@@ -541 +541 @@
 #
 $pbos->{'install'} =~ s/sudo//g;
+if (((defined $ENV{http_proxy}) && ($ENV{http_proxy} ne '')) || ((defined $ENV{ftp_proxy}) && ($ENV{ftp_proxy} ne ''))) {
+    if ($pbos->{'name'} eq "opensuse") {
+        # For opensuse 11.4 or 12.1 -- one of them didn't work with http_proxy or HTTP_PROXY set.
+        open(PROXY, "> $vepath/etc/sysconfig/proxy") || die "can't open $vepath/etc/sysconfig/proxy: $!";
+        print PROXY "HTTP_PROXY=$ENV{http_proxy}\n" if ((defined $ENV{http_proxy}) && ($ENV{http_proxy} ne ''));
+        print PROXY "FTP_PROXY=$ENV{ftp_proxy}\n" if ((defined $ENV{ftp_proxy}) && ($ENV{ftp_proxy} ne ''));
+        close(PROXY);
+    }
+}
+
+# Keep redhat variants from destroying nis domain on install
+#pb_system("chroot $vepath /bin/bash -e -c \"ln -snf /bin/true /bin/domainname\"");
+
+#if ($pbos->{'name'} =~ /fedora/i) { # hack to prevent fedora from destroying NIS settings on host
+#   open (AUTH, ">$vepath/etc/pam.d/system-auth-ac") || die "unable to open $vepath/etc/pam.d/system-auth-ac for write: $!";
+#   print AUTH "#pam_systemd -- will fix later in bootstrap\n";
+#   close(AUTH);
+#}
 pb_system("chroot $vepath /bin/bash -c \"$pbos->{'install'} $minipkglist \"","Bootstrapping OS by running $pbos->{'install'} $minipkglist");
 
@@ -557 +575 @@
 #
 pb_log(1,"Authfix\n");
-pb_system("chroot $vepath /bin/bash -c \"if [ -x /usr/bin/authconfig ]; then /usr/bin/authconfig --enableshadow --update; fi\"","Calling authconfig");
+# TODO: Not generic enough to be done like that IMHO
+# In case it was changed during the install
+#pb_system("chroot $vepath /bin/bash -e -c \"ln -snf /bin/true /bin/domainname\"");
+pb_system("chroot $vepath /bin/bash -c \"if [ -x /usr/bin/authconfig ]; then /usr/bin/authconfig --enableshadow --update --nostart; fi\"","Calling authconfig");
 
 # Installed additional packages we were asked to