Changeset 3230 in /cluster/svnroot


Ignore:
Timestamp:
Jun 12, 2011 1:00:19 PM (9 years ago)
Author:
skylar
Message:

merging in newer kernel, squashfs (#457, #629)

Location:
bccd-ng/trunk
Files:
2 deleted
8 edited
2 copied

Legend:

Unmodified
Added
Removed
  • bccd-ng/trunk/bin/build_livecd.pl

    r3205 r3230  
    4949my($debmirror,$websvn,$rc,$out,$ft,$tmpdir,$cwd,$svnrev,
    5050   $Bccd,$allout,$rpkgs,$nouid,$nogid,$debmirror_host,
    51    $debmirror_name,$debsecmirror,$dir,$release);
     51   $debmirror_name,$debsecmirror,$dir,$kern_deb);
    5252my(@lsof,@pids,@rd);
    5353
     
    119119Readonly my $CHECKIN    => "$NEWHOME/meta/nodes/";
    120120Readonly my $LIBFETCH   => "/root/liberate";
    121 Readonly my $KERNREV    => "2.6.31.12-aufs";
     121Readonly my $KERNREV    => "2.6.38bccd";
    122122$ENV{'DEBIAN_FRONTEND'} = "noninteractive";
    123123Readonly my $PERLDIR        => "/usr/local/lib/site_perl/";
     
    135135                                "advansys.ko",
    136136                                "aic7xxx.ko",
    137                                 "cloop.ko",
    138137                                "dc395x.ko",
    139138                                "dtc.ko",
     
    602601        "/usr/sbin/chroot $BUILDDIR ln -s /usr/lib32/libstdc++.so.6 /usr/lib32/libstdc++.so",
    603602        );
    604 }
     603    $kern_deb = 'linux-image-2.6.38bccd_2.6.38bccd-10.00.Custom_amd64.deb';
     604}
     605else {
     606    $kern_deb = 'linux-image-2.6.38bccd_2.6.38bccd-10.00.Custom_i386.deb';
     607}
     608
     609$Bccd->run_test(
     610    "fcopy",
     611    "",
     612    "Copy $kern_deb into $BUILDDIR",
     613    "/root/$kern_deb",
     614    "$BUILDDIR/tmp/$kern_deb",
     615    );
     616
     617$Bccd->run_test(
     618    "system",
     619    "",
     620    "Installing new kernel.",
     621    "/usr/bin/chroot $BUILDDIR /usr/bin/dpkg -i /tmp/$kern_deb",
     622    );
     623
     624$Bccd->run_test(
     625    "unlink",
     626    "",
     627    "Removing kernel deb file.",
     628    "$kern_deb",
     629    );
    605630
    606631# Workaround for tftpd-hpa/inetd conflict
     
    12721297        "/usr/sbin/chroot $BUILDDIR /usr/bin/rsync -av --progress /$opts{'arch'}/ /",
    12731298    );
    1274 
    1275 $Bccd->run_test(
    1276         "fcopy",
    1277         "",
    1278         "Copied cloop.ko into $tmpdir.",
    1279         "$BUILDDIR/KNOPPIX/KNOPPIX/modules/cloop.ko",
    1280         "$tmpdir/cloop.ko",
    1281         );
    12821299
    12831300$Bccd->run_test(
     
    14701487
    14711488$Bccd->run_test(
    1472     "fmove",
    1473     "",
    1474     "Moved cloop.ko into KNOPPIX directory.",
    1475     "$tmpdir/cloop.ko",
    1476     "$tmpdir/KNOPPIX/KNOPPIX/modules/cloop.ko",
    1477     );
    1478 
    1479 
    1480 $Bccd->run_test(
    14811489        "revfetch",
    14821490        "",
     
    16211629    "",
    16221630    "Created compressed root filesystem.",
    1623     "bash -c 'genisoimage -R -U -V BCCD-NG -publisher ccg -hide-rr-moved -cache-inodes -no-bak -pad $BUILDDIR | create_compressed_fs  - 65536 > $tmpdir/KNOPPIX/KNOPPIX/KNOPPIX'",
     1631    "mksquashfs build-bccd $tmpdir/KNOPPIX/KNOPPIX/KNOPPIX",
    16241632    );
    16251633
     
    16281636    "",
    16291637    "Created bootable ISO image.",
    1630     "genisoimage -pad -l -r -J -v -V BCCD-NG -no-emul-boot -boot-load-size 4 -boot-info-table -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat -hide-rr-moved -o $opts{'outiso'} $tmpdir/KNOPPIX",
     1638    "genisoimage -pad -l -r -J -v -V BCCDv3-$svnrev -no-emul-boot -boot-load-size 4 -boot-info-table -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat -hide-rr-moved -o $opts{'outiso'} $tmpdir/KNOPPIX",
    16311639    );
    16321640
  • bccd-ng/trunk/packages/boot/grub/menu.lst

    • Property svn:keywords set to Id
    r2849 r3230  
    55splashimage (hd0,0)/grub/bccd_logo_new.xpm.gz
    66
    7 title "2.6.31.12-aufs"
    8 root (hd0,0)
    9 kernel /vmlinuz-2.6.31.12-aufs root=/dev/mapper/bccd-slash ro vga=791 lang=us nomkxorgconfig 5
    10 initrd /initramfs-2.6.31.12-aufs
     7### BEGIN AUTOMAGIC KERNELS LIST
     8## lines between the AUTOMAGIC KERNELS LIST markers will be modified
     9## by the debian update-grub script except for the default options below
     10
     11## DO NOT UNCOMMENT THEM, Just edit them to your needs
     12
     13## ## Start Default Options ##
     14## default kernel options
     15## default kernel options for automagic boot options
     16## If you want special options for specific kernels use kopt_x_y_z
     17## where x.y.z is kernel version. Minor versions can be omitted.
     18## e.g. kopt=root=/dev/hda1 ro
     19##      kopt_2_6_8=root=/dev/hdc1 ro
     20##      kopt_2_6_8_2_686=root=/dev/hdc2 ro
     21# kopt=root=/dev/mapper/bccd-slash ro
     22
     23## default grub root device
     24## e.g. groot=(hd0,0)
     25# groot=(hd0,0)
     26
     27## should update-grub create alternative automagic boot options
     28## e.g. alternative=true
     29##      alternative=false
     30# alternative=true
     31
     32## should update-grub lock alternative automagic boot options
     33## e.g. lockalternative=true
     34##      lockalternative=false
     35# lockalternative=false
     36
     37## additional options to use with the default boot option, but not with the
     38## alternatives
     39## e.g. defoptions=vga=791 resume=/dev/hda5
     40# defoptions=vga=791 lang=us nomkxorgconfig 5
     41
     42## should update-grub lock old automagic boot options
     43## e.g. lockold=false
     44##      lockold=true
     45# lockold=false
     46
     47## Xen hypervisor options to use with the default Xen boot option
     48# xenhopt=
     49
     50## Xen Linux kernel options to use with the default Xen boot option
     51# xenkopt=console=tty0
     52
     53## altoption boot targets option
     54## multiple altoptions lines are allowed
     55## e.g. altoptions=(extra menu suffix) extra boot options
     56##      altoptions=(single-user) single
     57# altoptions=(single-user mode) single
     58
     59## controls how many kernels should be put into the menu.lst
     60## only counts the first occurence of a kernel, not the
     61## alternative kernel options
     62## e.g. howmany=all
     63##      howmany=7
     64# howmany=all
     65
     66## should update-grub create memtest86 boot option
     67## e.g. memtest86=true
     68##      memtest86=false
     69# memtest86=true
     70
     71## should update-grub adjust the value of the default booted system
     72## can be true or false
     73# updatedefaultentry=false
     74
     75## should update-grub add savedefault to the default options
     76## can be true or false
     77# savedefault=false
     78
     79## ## End Default Options ##
     80
     81### END DEBIAN AUTOMAGIC KERNELS LIST
  • bccd-ng/trunk/packages/liberate.pl

    r3166 r3230  
    345345    "",
    346346    "Created regular initramfs.",
    347     "/usr/sbin/chroot $LIBDIR /usr/sbin/mkinitramfs -o /boot/initramfs-$KERNREV $KERNREV",
     347    "/usr/sbin/chroot $LIBDIR /usr/sbin/mkinitramfs -o /boot/initrd.img-$KERNREV $KERNREV",
    348348    );
    349349
     
    352352    "",
    353353    "Created diskless initramfs.",
    354     "/usr/sbin/chroot $LIBDIR /usr/sbin/mkinitramfs -d /etc/initramfs-tools.diskless -o /var/lib/tftpboot/initramfs-$KERNREV $KERNREV",
     354    "/usr/sbin/chroot $LIBDIR /usr/sbin/mkinitramfs -d /etc/initramfs-tools.diskless -o /var/lib/tftpboot/initrd.img-$KERNREV $KERNREV",
    355355    );
    356356
     
    505505        );
    506506}
     507
     508$Bccd->run_test(
     509    "unlink",
     510    "0",
     511    "Removing old /boot symlink.",
     512    "/boot",
     513    );
     514
     515$Bccd->run_test(
     516    "symlink",
     517    "",
     518    "Linking /liberate/boot -> /boot for update-grub",
     519    "/liberate/boot",
     520    "/boot",
     521    );
     522
     523$Bccd->run_test(
     524        "system",
     525        "",
     526        "Updating grub menu with kernel info.",
     527        "/sbin/update-grub",
     528        );
    507529
    508530$Bccd->run_test(
  • bccd-ng/trunk/trees/KNOPPIX/KNOPPIX/md5sums

    r914 r3230  
    414134575e1041a2f37b358cc0db49d2598e *KNOPPIX/LICENSE.txt
    42425956506307611476351494234e7608a8 *KNOPPIX/modules/aufs.ko
    43 e28832aaf55f1fe232dd6d96a200b353 *KNOPPIX/modules/cloop.ko
    4443845cf26c71754e6a7262ec7a3873251c *KNOPPIX/README_Security.txt
  • bccd-ng/trunk/trees/KNOPPIX/boot/isolinux/minirt/linuxrc

    r3174 r3230  
    580580  # DEBUG
    581581  # echo "6" > /proc/sys/kernel/printk
    582   loadmodule cloop.ko file="$1/$KNOPPIX_DIR/$KNOPPIX_NAME" $CLOOP_PRELOAD || \
    583     loadmodule cloop.ko file="$1/$KNOPPIX_DIR/$KNOPPIX_NAME"
    584   mountit /dev/cloop /KNOPPIX "-o ro" || FOUND_KNOPPIX=""
     582  insmod /modules/loop.ko
     583  /bbin/mount -t squashfs $1/$KNOPPIX_DIR/$KNOPPIX_NAME /KNOPPIX || FOUND_KNOPPIX=""
    585584  # Allow multi-image KNOPPIX mounts
    586585  if [ -n "$FOUND_KNOPPIX" -a -x "$DYNLOADER" -a -x losetup ]; then
  • bccd-ng/trunk/trees/usr/local/lib/site_perl/5.10.0/Bccd.pm

    r3199 r3230  
    4646my $passed = 0;
    4747my $total = 0;
    48 Readonly my $KERNREV => '2.6.31.12-aufs';
     48Readonly my $KERNREV => '2.6.38bccd';
    4949Readonly my $DHCFILE => '/etc/dhcp3/dhclient.conf';
    5050Readonly my $ALLOUTFILE    => "allout";
     
    20292029        print $PCONF "label bccd\n";
    20302030        print $PCONF "\tkernel vmlinuz-$KERNREV\n";
    2031         print $PCONF "\tappend ETHERNET=eth0 initrd=initramfs-$KERNREV root=/dev/nfs nfsroot=$nic_conf->{$pxenic}->{'ipaddr'}:/ ip=dhcp init=/sbin/init vga=791 lang=us\n";
     2031        print $PCONF "\tappend ETHERNET=eth0 initrd=initrd.img-$KERNREV root=/dev/nfs nfsroot=$nic_conf->{$pxenic}->{'ipaddr'}:/ ip=dhcp init=/sbin/init vga=791 lang=us\n";
    20322032       
    20332033        close($PCONF);
Note: See TracChangeset for help on using the changeset viewer.