Changeset 4841 in /cluster/svnroot


Ignore:
Timestamp:
Jul 29, 2014 11:09:38 PM (6 years ago)
Author:
skylar
Message:

merging in v3.3.2 changes (#856)

Location:
bccd-ng/branches/skylar/bccd-3.4.0
Files:
8 edited
2 copied

Legend:

Unmodified
Added
Removed
  • bccd-ng/branches/skylar/bccd-3.4.0

  • bccd-ng/branches/skylar/bccd-3.4.0/bin/build_livecd.pl

    r4820 r4841  
    343343    "$BUILDDIR/etc/dhcp", "$BUILDDIR/etc/ssh", "$BUILDDIR/$SOFTWARE",
    344344    "$BUILDDIR/root/.ssh", "$BUILDDIR/nfs", "$BUILDDIR/$LIBFETCH",
    345     "$BUILDDIR/var/log/apache2","$BUILDDIR/run/network",
     345    "$BUILDDIR/var/run", "$BUILDDIR/var/log/apache2",
    346346    "$BUILDDIR/etc/apt/preferences.d/",
    347347    "$BUILDDIR/var/lib/initramfs-tools", ) {
     
    435435    "init.d/bccd-automated", "init.d/bccd-passwd","init.d/bccd-dhcp",
    436436    "init.d/bccd-sshd", "X11/xorg.conf","lam.conf", "init.d/bccd-nfs",
    437     "init.d/bccd-unite-sw", "init.d/bccd-dhcp-conf",
     437    "init.d/bccd-unite-sw", "init.d/bccd-nics","init.d/bccd-dhcp-conf",
    438438    "init.d/bccd-route", "init.d/bccd-keyboard", "rc.local",
    439439    "init.d/bccd-fsrw", "init.d/bccd-mail", "ld.so.conf.d/CUDA.conf",
    440     "init.d/nfs-common","init.d/bccd-liberate") {
     440    "init.d/networking","init.d/nfs-common","init.d/bccd-liberate") {
    441441    $Bccd->run_test(
    442442        "fcopy",
     
    457457
    458458foreach my $file ( "bccd-networking", "bccd-passwd", "bccd-dhcp", "bccd-sshd",
    459     "bccd-nfs", "bccd-unite-sw", "bccd-dhcp-conf",
     459    "bccd-nfs", "bccd-unite-sw", "networking","bccd-nics", "bccd-dhcp-conf",
    460460    "bccd-route", "bccd-keyboard", "bccd-fsrw", "bccd-mail", "bccd-bootflags",
    461461    "bccd-automated", "nfs-common", "bccd-liberate", ) {
     
    961961foreach my $script ("nis", "ssh-host-keys", "nfs-kernel-server", "ssh",
    962962    "isc-dhcp-server", "dbus", "hal", "apache2","mpd",
    963     "networking","bccd-usage",
     963    "module-init-tools","networking","bccd-usage",
    964964    "bccd-mount-virtfs",) {
    965965    $Bccd->run_test(
  • bccd-ng/branches/skylar/bccd-3.4.0/packages/packages.conf

    r4786 r4841  
    5050   - dialog
    5151   - lvm2
    52    - grub
     52   - grub-legacy
    5353   - parted
    5454   - tzdata
  • bccd-ng/branches/skylar/bccd-3.4.0/trees/arch/i386/bccd

  • bccd-ng/branches/skylar/bccd-3.4.0/trees/bin/bccd-nic-setup

  • bccd-ng/branches/skylar/bccd-3.4.0/trees/bin/bccd-reset-network

    r4819 r4841  
    2525LOGCMD="logger -t $(basename $0)"
    2626NATSH=/etc/network/if-up.d/nat
     27# Bug with UI::Dialog GTK not picking up variables
     28unset DISPLAY
    2729
    2830# Wheezy bug causes arrow keys not to work with UI::Dialog on boot
  • bccd-ng/branches/skylar/bccd-3.4.0/trees/diskless

  • bccd-ng/branches/skylar/bccd-3.4.0/trees/usr/local/lib/site_perl/Bccd.pm

    r4807 r4841  
    604604    }
    605605
    606     print $OUTFILE "MD5 ($infile) = ".$md5->hexdigest()."\n";
     606    print $OUTFILE "MD5 (".basename($infile).") = ".$md5->hexdigest()."\n";
    607607
    608608    if(!defined(close($INFILE))) {
     
    21582158        }
    21592159    }
    2160 
     2160   
    21612161  HAVE_DHCP:
    21622162  foreach my $nic (keys(%{$self->{nic_conf}})) {
     
    26812681                    .'no IP address.'
    26822682                );
     2683            $d->msgbox(
     2684                text => 'The next screen has a list of NICs and their '
     2685                    .'IP addresses. Select the NIC that you want to setup a '
     2686                    .'BCCD network on. For LittleFe, this will be the one with '
     2687                    .'no IP address.'
     2688                );
    26832689            # Set NIC that will have a locked-down DHCP server listening on it
    26842690            $bccd_nic = $d->menu(text=>"Choose NIC to have BCCD network.", list => \@dhcp_nics);
     
    29642970    $cmd = [
    29652971        'killall',
    2966         '/sbin/dhclient',
     2972        'dhclient',
    29672973    ];
    29682974    ($out,$rc) = $self->exec_system($cmd);
     
    29752981   
    29762982    $cmd = [
    2977         '/sbin/dhclient',
     2983        'dhclient',
    29782984        '-cf',
    29792985        $cfg,
Note: See TracChangeset for help on using the changeset viewer.