Skip to content
This repository has been archived by the owner on Nov 19, 2023. It is now read-only.

Commit

Permalink
* PXE-Boot-Erweiterungen (schließt #286).
Browse files Browse the repository at this point in the history
* PXE-Boot-Konfiguration verbessert (schließt #288).
* Opsi-Support implementiert (schließt #282).
* Kernel & Linbofs lzma komprimiert (schließt #287), linbofs.gz zu linbofs.lz umbenannt, 64G-Unterstützung aktiviert.
* -w wird nicht mehr an Offline-Hostnamen angehängt (schließt #66).
* Maschinenpasswort-Handling verbessert (schließt #289).
* Div. Code aufgeräumt.
  • Loading branch information
HappyBasher committed Mar 6, 2014
1 parent 112e000 commit 6373237
Show file tree
Hide file tree
Showing 83 changed files with 11,797 additions and 753 deletions.
4 changes: 2 additions & 2 deletions buildpackage.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

for i in conf debian etc examples linbo share; do
for i in conf debian etc linbo share var; do
find ${i}/ -type f -name \*~ -exec rm '{}' \;
done

Expand All @@ -15,4 +15,4 @@ fakeroot dpkg-buildpackage \
-Isrc \
-Ikernel \
-Ilinbo_gui/linbo_gui \
-Ilinbo_gui/qt-*
-Ilinbo_gui/qt-*
4 changes: 2 additions & 2 deletions conf/busybox.conf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.13.4
# Wed Jul 29 20:27:27 2009
# Fri Jan 31 11:25:21 2014
#
CONFIG_HAVE_DOT_CONFIG=y

Expand Down Expand Up @@ -561,7 +561,7 @@ CONFIG_DC=y
# CONFIG_DEVMEM is not set
CONFIG_EJECT=y
# CONFIG_FEATURE_EJECT_SCSI is not set
# CONFIG_FBSPLASH is not set
CONFIG_FBSPLASH=y
# CONFIG_INOTIFYD is not set
CONFIG_LAST=y
CONFIG_FEATURE_LAST_SMALL=y
Expand Down
10 changes: 8 additions & 2 deletions conf/initramfs.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# initramfs.conf
# thomas@linuxmuster.net
# 31.10.2013
# 14.02.2014

# busybox
dir /bin 755 0 0
Expand All @@ -12,16 +12,18 @@ dir /etc 755 0 0
dir /etc/modprobe.d 755 0 0
file /etc/busybox.conf /dev/null 644 0 0
file /etc/inittab ../../linbo/etc/inittab 644 0 0
file /etc/german.kbd ../../linbo/etc/german.kbd 644 0 0
file /etc/passwd ../../linbo/etc/passwd 644 0 0
file /etc/group ../../linbo/etc/group 644 0 0
file /etc/filesystems ../../linbo/etc/filesystems 644 0 0
file /etc/fstab ../../linbo/etc/fstab 644 0 0
file /etc/linbo-version ../../linbo/etc/linbo-version 644 0 0
file /etc/services ../../linbo/etc/services 644 0 0
file /etc/nsswitch.conf ../../linbo/etc/nsswitch.conf 644 0 0
file /etc/splash.conf ../../linbo/etc/splash.conf 644 0 0
file /etc/splash.pnm ../../linbo/etc/splash.pnm 644 0 0
file /etc/newdev-patch.bvi ../../linbo/etc/newdev-patch.bvi 644 0 0
file /etc/profile ../../linbo/etc/profile 644 0 0
file /etc/german.kbd ../../var/german.kbd 644 0 0

# shared libraries
file /lib/libattr.so.1 /lib/i386-linux-gnu/libattr.so.1 755 0 0
Expand Down Expand Up @@ -76,6 +78,10 @@ file /bin/kexec ../../src/kexec-tools/build/sbin/kexec 755 0 0

# init-tools
file /bin/killall5 /sbin/killall5 755 0 0
file /usr/bin/bc /usr/bin/bc 755 0 0
file /lib/libreadline.so.6 /lib/i386-linux-gnu/libreadline.so.6 755 0 0
file /usr/bin/setterm /usr/bin/setterm 755 0 0
file /usr/bin/tput /usr/bin/tput 755 0 0

# udp-receiver (Multicast client)
file /bin/udp-receiver /usr/bin/udp-receiver 755 0 0
Expand Down
25 changes: 12 additions & 13 deletions conf/kernel.conf
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ CONFIG_HAVE_KERNEL_LZMA=y
CONFIG_HAVE_KERNEL_XZ=y
CONFIG_HAVE_KERNEL_LZO=y
# CONFIG_KERNEL_GZIP is not set
CONFIG_KERNEL_BZIP2=y
# CONFIG_KERNEL_LZMA is not set
# CONFIG_KERNEL_BZIP2 is not set
CONFIG_KERNEL_LZMA=y
# CONFIG_KERNEL_XZ is not set
# CONFIG_KERNEL_LZO is not set
CONFIG_DEFAULT_HOSTNAME="(none)"
Expand Down Expand Up @@ -283,6 +283,7 @@ CONFIG_X86_MPPARSE=y
CONFIG_SCHED_OMIT_FRAME_POINTER=y
CONFIG_PARAVIRT_GUEST=y
# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
# CONFIG_XEN is not set
# CONFIG_XEN_PRIVILEGED_GUEST is not set
CONFIG_KVM_CLOCK=y
CONFIG_KVM_GUEST=y
Expand Down Expand Up @@ -369,12 +370,13 @@ CONFIG_MICROCODE_OLD_INTERFACE=y
CONFIG_X86_MSR=y
CONFIG_X86_CPUID=y
# CONFIG_NOHIGHMEM is not set
CONFIG_HIGHMEM4G=y
# CONFIG_HIGHMEM64G is not set
# CONFIG_HIGHMEM4G is not set
CONFIG_HIGHMEM64G=y
CONFIG_PAGE_OFFSET=0xC0000000
CONFIG_HIGHMEM=y
# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set
CONFIG_X86_PAE=y
CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
CONFIG_ARCH_DMA_ADDR_T_64BIT=y
CONFIG_NEED_NODE_MEMMAP_SIZE=y
CONFIG_ARCH_FLATMEM_ENABLE=y
CONFIG_ARCH_SPARSEMEM_ENABLE=y
Expand All @@ -390,7 +392,7 @@ CONFIG_HAVE_MEMBLOCK=y
# CONFIG_MEMORY_HOTPLUG is not set
CONFIG_SPLIT_PTLOCK_CPUS=4
# CONFIG_COMPACTION is not set
# CONFIG_PHYS_ADDR_T_64BIT is not set
CONFIG_PHYS_ADDR_T_64BIT=y
CONFIG_ZONE_DMA_FLAG=1
CONFIG_BOUNCE=y
CONFIG_VIRT_TO_BUS=y
Expand Down Expand Up @@ -540,7 +542,6 @@ CONFIG_ISA_DMA_API=y
# CONFIG_ISA is not set
# CONFIG_MCA is not set
# CONFIG_SCx200 is not set
# CONFIG_OLPC is not set
# CONFIG_ALIX is not set
CONFIG_AMD_NB=y
CONFIG_PCCARD=y
Expand Down Expand Up @@ -1505,7 +1506,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_BACKLIGHT is not set
CONFIG_FB_MODE_HELPERS=y
CONFIG_FB_TILEBLITTING=y
# CONFIG_FB_TILEBLITTING is not set

#
# Frame buffer hardware drivers
Expand Down Expand Up @@ -1576,13 +1577,11 @@ CONFIG_DUMMY_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
CONFIG_FB_CON_DECOR=y
# CONFIG_FONTS is not set
CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y
CONFIG_LOGO=y
CONFIG_LOGO_LINUX_MONO=y
CONFIG_LOGO_LINUX_VGA16=y
CONFIG_LOGO_LINUX_CLUT224=y
# CONFIG_LOGO is not set
# CONFIG_SOUND is not set
CONFIG_HID_SUPPORT=y
CONFIG_HID=y
Expand Down
46 changes: 46 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,49 @@
linuxmuster-linbo (2.2.0-0) precise-testing; urgency=low

* pxe boot extensions (closes #286):
- added linbo-wrapper commands as kernel parameter:
linbocmd=<cmd1>,<cmd2> (see help of linbo-remote).
- changed linbo wallpaper and boot logo.
- added fbcondecor patch to linbo kernel.
- implemented splash output for boot process, new splash kernel option.
- changed to atftpd as default tftp server so that we can use pipes.
- added -p parameter to linbo-remote to create a one time pxeboot configuration file
with commands which will be automatically executed on next client boot,
it is created as a pipe therefore it can be deleted once the client
has requested it.
* pxe boot configuration improvements (closes #288):
- added new global start.conf option "KernelOptions" for group
specific linbo kernel parameters.
- postinst invokes automatical update of existing start.conf files.
* opsi support (closes #282):
- new image.opsi file which contains the current opsi state of the imaged client.
- new rsync-post-download script to handle opsi status update for client.
- on image creation a image.opsi file which reflects the current opsi
state is added on post upload.
- linbo_cmd patches client-agent configuration with hostname and pckey.
* kernel, linbofs:
- changed to more effective lzma archive format, renamed
linbofs.gz to linbofs.lz (closes #287)
- recompiled with 64G RAM support.
* improved support for wlan clients (closes #66):
- removed -w suffix for hostnames if offline in linbo_cmd.
* machine passwort handling improvements (closes #289):
- moved invokation of machine password update from syncl() to start(),
so it happens on every os start.
* linbo_cmd enhancements:
- minor code cleanup, console output improvements.
- fixed restore of rsync image.
- reworked torrent download.
* update-linbofs.sh: code cleanup, removed unnecessary tasks.
* source package directory structure cleanup.
* preinst and postinst code cleanup.
* linbo-remote enhancements:
- standalone use of -w param added so that clients can only be waked up.
- added 3 sec. pause between multiple commands.
* init.sh: network detection optimations.

-- Thomas Schmitt <thomas@linuxmuster.net> Thu, 06 Mar 2014 16:12:53 +0100

linuxmuster-linbo (2.1.10-0) precise; urgency=low

* added backports driver 3.13-1 and removed compat-wireless to update alx.
Expand Down
4 changes: 2 additions & 2 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ Source: linuxmuster-linbo
Section: admin
Priority: extra
Maintainer: Thomas Schmitt <thomas@linuxmuster.net>
Build-Depends: bison, build-essential, bvi, coreutils, debhelper, dosfstools, dpkg-dev, dropbear, e2fsprogs, ethtool, fakeroot, flex, g++, gcc, gettext, grep, gzip, libacl1-dev, libattr1-dev, libaudio-dev, libcups2-dev, libdevmapper-dev, libfontconfig1-dev, libfreetype6-dev, libfuse-dev, libgl1-mesa-dev, libglu1-mesa-dev, libice-dev, libiodbc2-dev, libjpeg-dev, libmng-dev, libmysqlclient-dev, libncurses5-dev, libpng12-dev, libpopt-dev, libpq-dev, libsm-dev, libsqlite3-dev, libstdc++6, libx11-dev, libxcursor-dev, libxext-dev, libxft-dev, libxi-dev, libxinerama-dev, libxmu-dev, libxrandr-dev, libxrender-dev, libxt-dev, nasm, ncurses-base, patchutils, perl, reiserfsprogs, sysvinit-utils, tar, udev, udpcast, unzip, util-linux, wget, zlib1g-dev
Build-Depends: bison, build-essential, bvi, coreutils, debhelper, dosfstools, dpkg-dev, dropbear, e2fsprogs, ethtool, fakeroot, flex, g++, gcc, gettext, grep, gzip, libacl1-dev, libattr1-dev, libaudio-dev, libcups2-dev, libdevmapper-dev, libfontconfig1-dev, libfreetype6-dev, libfuse-dev, libgl1-mesa-dev, libglu1-mesa-dev, libice-dev, libiodbc2-dev, libjpeg-dev, libmng-dev, libmysqlclient-dev, libncurses5-dev, libpng12-dev, libpopt-dev, libpq-dev, libsm-dev, libsqlite3-dev, libstdc++6, libx11-dev, libxcursor-dev, libxext-dev, libxft-dev, libxi-dev, libxinerama-dev, libxmu-dev, libxrandr-dev, libxrender-dev, libxt-dev, nasm, ncurses-base, patchutils, perl, reiserfsprogs, sysvinit-utils, tar, udev, udpcast, unzip, util-linux, wget, xz-lzma, zlib1g-dev

Package: linuxmuster-linbo
Architecture: all
Depends: rsync (>= 2.6.9), bittorrent, dropbear, ssh, sed, screen, mkisofs, dosfstools, linuxmuster-base (>= 1.4.36), tftpd-hpa, udpcast, zip, mbr, etherwake
Depends: rsync (>= 2.6.9), bittorrent, dropbear, ssh, sed, screen, mkisofs, dosfstools, linuxmuster-base (>= 1.4.36), atftpd (>= 0.7.dfsg-11.1), udpcast, xz-lzma, zip, mbr, etherwake
Suggests: isc-dhcp-server | dhcp3-server
Recommends: wodim, ldap-utils
Description: LINBO PXE boot files
Expand Down
2 changes: 1 addition & 1 deletion debian/dirs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
/var/linbo
/var/linbo/examples
/var/linbo/icons
/var/linbo/pxelinux.cfg
/var/linbo/pxelinux.cfg/templates
/var/log/linuxmuster/linbo
/usr/lib/linuxmuster-linbo
/usr/sbin
Expand Down
1 change: 0 additions & 1 deletion debian/links
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
etc/linuxmuster/linbo/start.conf.default var/linbo/start.conf
var/linbo/pxelinux.cfg/default etc/linuxmuster/linbo/pxelinux.cfg.default
var/linbo/examples usr/share/doc/linuxmuster-linbo/examples
usr/share/linuxmuster-linbo/update-linbofs.sh usr/sbin/update-linbofs
usr/share/linuxmuster-linbo/make-linbo-media.sh usr/sbin/make-linbo-media
Expand Down
Loading

0 comments on commit 6373237

Please sign in to comment.