diff --git a/boottoolsfunctions.lib b/boottoolsfunctions.lib index c8fef78..b1f00d0 100644 --- a/boottoolsfunctions.lib +++ b/boottoolsfunctions.lib @@ -332,28 +332,24 @@ ALLOWOPTIONS 1 MENU TITLE OpenGnsys ${NAMEISOCLIENT} -LABEL gpxe -MENU LABEL gpxe -KERNEL /clonezilla/live/vmlinuz1 -APPEND initrd=/clonezilla/live/initrd1.img boot=live union=aufs noswap vga=788 ip=frommedia LABEL 0 -MENU LABEL ogClient vga irqpool acpi ogdebug ip:none +MENU LABEL ogLive vga irqpool acpi ogdebug ip:none KERNEL /ogclient/linuxISO APPEND initrd=/ogclient/oginitrd.img ro vga=788 irqpoll acpi=on boot=oginit og2nd=sqfs ogprotocol=local ogactiveadmin=true ogdebug=true ip=none LABEL 1 -MENU LABEL ogClient irqpoll acpi ip:none +MENU LABEL ogLive irqpoll acpi ip:none KERNEL /ogclient/linuxISO APPEND initrd=/ogclient/oginitrd.img ro irqpoll acpi=on boot=oginit og2nd=sqfs ogprotocol=local ogactiveadmin=true ogdebug=false ip=none LABEL 2 -MENU LABEL ogClient acpi debug ip=dhcp +MENU LABEL ogLive acpi debug ip=dhcp KERNEL /ogclient/linuxISO APPEND initrd=/ogclient/oginitrd.img ro acpi=on boot=oginit og2nd=sqfs ogprotocol=local ogactiveadmin=true ogdebug=true ip=dhcp LABEL 3 -MENU LABEL ogClient ip=dhcp +MENU LABEL ogLive ip=dhcp KERNEL /ogclient/linuxISO APPEND initrd=/ogclient/oginitrd.img ro acpi=off boot=oginit og2nd=sqfs ogprotocol=local ogactiveadmin=true ogdebug=false ip=dhcp @@ -377,6 +373,11 @@ KERNEL gpxe.pxe label 8 MENU LABEL Network boot via gPXE iso KERNEL gpxe.iso + +label 9 +MENU LABEL gpxe +KERNEL /clonezilla/live/vmlinuz1 +APPEND initrd=/clonezilla/live/initrd1.img boot=live union=aufs noswap vga=788 ip=frommedia FIN diff --git a/includes/usr/bin/boot-tools/boottoolsSoftwareCompile.sh b/includes/usr/bin/boot-tools/boottoolsSoftwareCompile.sh index 14237ce..ca721c2 100755 --- a/includes/usr/bin/boot-tools/boottoolsSoftwareCompile.sh +++ b/includes/usr/bin/boot-tools/boottoolsSoftwareCompile.sh @@ -29,9 +29,32 @@ gdebi -n /var/cache/apt/archivesOG/xvesa.deb echo "partclone" gdebi -n /var/cache/apt/archivesOG/partclone_0.2.38_i386.deb +echo "busybox-static 1.17.1 en rootfs" +#echo "busybox-static 1.17.1 en ogLive rootfs permite reboot y poweroff +apt-get remove -y busybox-static +gdebi -n /var/cache/apt/archivesOG/busybox-static_1.17.1-10ubuntu1_i386.deb +cp /bin/busybox /bin/busyboxOLD +/bin/busyboxOLD +echo "busybox-static 1.18.5 en initrd" +apt-get install -y busybox-static +cp /bin/busybox /bin/busyboxNEW +/bin/busyboxNEW +# en scripts reboot y poweroff hacer llamada a busyboxOLD reboot|poweroff + + + +#gpt +apt-get install -y uuid-dev libicu-dev libpopt-dev libpopt0 ncurses-base libncurses5-dev +wget -O download.tgz http://sourceforge.net/projects/gptfdisk/files/gptfdisk/0.8.2/gptfdisk-0.8.2.tar.gz/download +mkdir download +tar xzvf download.tgz -C download +cd download/gptfdisk-0.8.2 +make +cp sgdisk gdisk fixparts cgdisk /sbin +cd .. +rm -fr download* + -#echo "En ubuntu oneiric es necesario la 1.17.1 de busybox-static" -#gdebi -n /var/cache/apt/archivesOG/busybox-static_1.17.1-10ubuntu1_i386.deb history -c \ No newline at end of file diff --git a/includes/usr/bin/boot-tools/listpackages/sw.basic b/includes/usr/bin/boot-tools/listpackages/sw.basic index 7acf3f9..358b76e 100644 --- a/includes/usr/bin/boot-tools/listpackages/sw.basic +++ b/includes/usr/bin/boot-tools/listpackages/sw.basic @@ -4,12 +4,14 @@ install man-db install fbset install gdebi-core install bash-static -install busybox-static -#la version de busysbox-static en oneiric no incluye el reboot y poweroff -> ver compilacion software en boottoolSoftwareCompile.sh +#La gestion del busybox-static (incompatibilidades reboot y poweroff) en boottoolSoftwareCompile.sh +#install busybox-static install console-data install locales install lshw install gawk install subversion install python-openssl -install python \ No newline at end of file +install python +install dmidecode +install hwinfo \ No newline at end of file diff --git a/includes/usr/bin/boot-tools/listpackages/sw.cloning b/includes/usr/bin/boot-tools/listpackages/sw.cloning index 9eda4b6..2585f56 100644 --- a/includes/usr/bin/boot-tools/listpackages/sw.cloning +++ b/includes/usr/bin/boot-tools/listpackages/sw.cloning @@ -13,4 +13,5 @@ install reglookup install libparse-win32registry-perl install grokevt install libhivex0 -install libhivex-bin \ No newline at end of file +install libhivex-bin +install rsync \ No newline at end of file