Grml-devel

Download

grml-devel@ml.grml.org

June 2014

3 participants
2 discussions

[PATCH 1/4] Remove hardcoded scripts path if not building from pkg.
by Krisztian VASAS 03 Jul '14

03 Jul '14

--- .../files/etc/apt/sources.list.d/debian.list/DEBIAN_WHEEZY | 4 ++++ etc/grml/grml-live.conf | 1 + grml-live | 11 +++++++---- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_WHEEZY b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_WHEEZY index 90bbbbf..44fcedc 100644 --- a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_WHEEZY +++ b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_WHEEZY @@ -6,6 +6,10 @@ deb http://security.debian.org/ wheezy/updates main contrib deb-src http://security.debian.org/ wheezy/updates main contrib +# backports: + deb http://http.debian.net/debian wheezy-backports main + deb-src http://http.debian.net/debian wheezy-backports main + # official debian repository: # deb http://ftp.debian.org/debian/ wheezy main contrib non-free # deb-src http://ftp.debian.org/debian/ wheezy main contrib non-free diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf index 84fe564..62a32dd 100644 --- a/etc/grml/grml-live.conf +++ b/etc/grml/grml-live.conf @@ -132,6 +132,7 @@ # template directory but please make sure it looks # likes the default directory [/usr/share/grml-live/templates] # TEMPLATE_DIRECTORY='/usr/share/grml-live/templates' +# SCRIPTS_DIRECTORY='/usr/share/grml-live/scripts' # Do you want to use console based isolinux boot splash # instead of the default graphical menu? diff --git a/grml-live b/grml-live index c5c2250..05be0e3 100755 --- a/grml-live +++ b/grml-live @@ -65,6 +65,7 @@ Usage: $PN [options, see as follows] -Q skip netboot package build -r <release_name> release name -s <suite> Debian suite/release, like: stable, testing, unstable + -S <script_directory> place of the scripts -t <template_directory> place of the templates -u update existing chroot instead of rebuilding it from scratch -U <username> arrange output to be owned by specified username @@ -310,7 +311,7 @@ copy_addon_file() { # }}} # command line parsing {{{ -while getopts "a:C:c:d:D:e:g:i:I:o:r:s:t:U:v:AbBFhnNqQuVz" opt; do +while getopts "a:C:c:d:D:e:g:i:I:o:r:s:S:t:U:v:AbBFhnNqQuVz" opt; do case "$opt" in a) ARCH="$OPTARG" ;; A) CLEAN_ARTIFACTS=1 ;; @@ -332,6 +333,7 @@ while getopts "a:C:c:d:D:e:g:i:I:o:r:s:t:U:v:AbBFhnNqQuVz" opt; do Q) SKIP_NETBOOT=1 ;; r) RELEASENAME="$OPTARG" ;; s) SUITE="$OPTARG" ;; + S) SCRIPTS_DIRECTORY="$OPTARG";; t) TEMPLATE_DIRECTORY="$OPTARG";; v) VERSION="$OPTARG" ;; F) FORCE=1 ;; @@ -392,6 +394,7 @@ fi [ -n "$SQUASHFS_EXCLUDES_FILE" ] || SQUASHFS_EXCLUDES_FILE="${GRML_FAI_CONFIG}/config/grml/squashfs-excludes" [ -n "$SUITE" ] || SUITE='testing' [ -n "$TEMPLATE_DIRECTORY" ] || TEMPLATE_DIRECTORY='/usr/share/grml-live/templates' +[ -n "$SCRIPTS_DIRECTORY" ] || SCRIPTS_DIRECTORY='/usr/share/grml-live/scripts' [ -n "$USERNAME" ] || USERNAME='grml' [ -n "$VERSION" ] || VERSION='0.0.1' @@ -1329,7 +1332,7 @@ else # make a 2048-byte bootsector for El Torito dd if=/dev/zero of=boot/grub/toriboot.bin bs=512 count=4 2>/dev/null # those are in 2048-byte sectors, so 1 16 matches 4 63 below - echo 1 16 | mksh /usr/share/grml-live/scripts/bootgrub.mksh -B 11 | \ + echo 1 16 | mksh ${SCRIPTS_DIRECTORY}/bootgrub.mksh -B 11 | \ dd of=boot/grub/toriboot.bin conv=notrunc 2>/dev/null fi log "$MKISOFS -V '${GRML_NAME} ${VERSION}' -publisher 'grml-live | grml.org' -l -r -J $BOOT_ARGS -o ${ISO_OUTPUT}/${ISO_NAME} ." @@ -1371,13 +1374,13 @@ else log "Creating hybrid ISO file with manifold/grub2 method" einfo "Creating hybrid ISO file with manifold/grub2 method" # 512 bytes: MBR, partition table, load GRUB 2 - echo 4 63 | mksh /usr/share/grml-live/scripts/bootgrub.mksh -A -M 4:0x96 -g $cyls:16:32 + echo 4 63 | mksh ${SCRIPTS_DIRECTORY}/bootgrub.mksh -A -M 4:0x96 -g $cyls:16:32 else log "Creating hybrid ISO file with manifold method" einfo "Creating hybrid ISO file with manifold method" # read only one but 2048-byte sized (scale: << 2) sector echo $bootoff $bootoff | \ - mksh /usr/share/grml-live/scripts/bootilnx.mksh -A -M 4:0x96 -g $cyls:16:32 -S 2 + mksh ${SCRIPTS_DIRECTORY}/bootilnx.mksh -A -M 4:0x96 -g $cyls:16:32 -S 2 fi | dd of="${ISO_OUTPUT}/${ISO_NAME}" conv=notrunc 2>/dev/null eend $? fi -- 1.9.1

3 6

Grml.org not reachable via IPv6
by Heiko Schlittermann 25 Jun '14

25 Jun '14

Hello, I'm just trying to reach grml.org ;; ANSWER SECTION: grml.org. 168 IN AAAA 2a02:790:1:12::6 via ipv6. It does not work. My uplink is via Sixxs and normally stable. ping6 to heise.de works. ping6 to grml.org doesn't work and connecting to port 80 does not work: listening on sixxs, link-type RAW (Raw IP), capture size 65535 bytes 11:10:42.139760 IP6 2a01:1e8:e100:272::2.60585 > 2a02:790:1:12::6.80: Flags [S], seq 1425174929, win 12200, options [mss 1220,sackOK,TS val 779758502 ecr 0,nop,wscale 7], length 0 11:10:43.137952 IP6 2a01:1e8:e100:272::2.60585 > 2a02:790:1:12::6.80: Flags [S], seq 1425174929, win 12200, options [mss 1220,sackOK,TS val 779758752 ecr 0,nop,wscale 7], length 0 11:10:45.141995 IP6 2a01:1e8:e100:272::2.60585 > 2a02:790:1:12::6.80: Flags [S], seq 1425174929, win 12200, options [mss 1220,sackOK,TS val 779759253 ecr 0,nop,wscale 7], length 0 11:10:49.154020 IP6 2a01:1e8:e100:272::2.60585 > 2a02:790:1:12::6.80: Flags [S], seq 1425174929, win 12200, options [mss 1220,sackOK,TS val 779760256 ecr 0,nop,wscale 7], length 0 ^C 4 packets captured 4 packets received by filter 0 packets dropped by kernel If you do not provide IPv6 connectivity, you should completly disable it or reject the connections instead of dropping them. This would enable a fast fallback to IPv4 on the client side. Best regards from Dresden/Germany Viele GrÃ¼ÃŸe aus Dresden Heiko Schlittermann -- SCHLITTERMANN.de ---------------------------- internet & unix support - Heiko Schlittermann, Dipl.-Ing. (TU) - {fon,fax}: +49.351.802998{1,3} - gnupg encrypted messages are welcome --------------- key ID: 7CBF764A - gnupg fingerprint: 9288 F17D BBF9 9625 5ABC 285C 26A9 687E 7CBF 764A - (gnupg fingerprint: 3061 CFBF 2D88 F034 E8D2 7E92 EE4E AC98 48D0 359B)-

2 1