diff options
| author | Felix Endres | 2007-06-01 18:11:56 +0200 |
|---|---|---|
| committer | Felix Endres | 2007-06-01 18:11:56 +0200 |
| commit | 014ce9a9e0dec78ecda10ec1ffdd6b0efa9614a3 (patch) | |
| tree | a54353e2547cddf3c5701c601811b0b06dcc0043 /initramfs | |
| parent | For Ubuntu: Include missing libraries for dhclient into initrd. (diff) | |
| download | core-014ce9a9e0dec78ecda10ec1ffdd6b0efa9614a3.tar.gz core-014ce9a9e0dec78ecda10ec1ffdd6b0efa9614a3.tar.xz core-014ce9a9e0dec78ecda10ec1ffdd6b0efa9614a3.zip | |
Generate warning message if ConfTGZ can not be unpacked
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1136 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs')
| -rw-r--r-- | initramfs/initrd-stuff/etc/functions | 6 | ||||
| -rw-r--r-- | initramfs/initrd-stuff/etc/messages | 2 | ||||
| -rw-r--r-- | initramfs/initrd-stuff/etc/messages.de | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions index 23f2a6c3..3d4afbc0 100644 --- a/initramfs/initrd-stuff/etc/functions +++ b/initramfs/initrd-stuff/etc/functions @@ -336,7 +336,11 @@ tftp -g -r $1 -l $dst $2 2>/dev/null # unpack part if [ -s $dst ] ; then # fixme: handle different types of packaging (gzip/bzip2)?? - tar -xpzf $dst 2>/dev/null + if ! tar -xpzf $dst 2> /tmp/ConfTGZ-tar-error ; then + cat /tmp/ConfTGZ-tar-error + error "$unpack_ConfTGZ" nonfatal + rm /tmp/ConfTGZ-tar-error + fi [ "$DEBUGLEVEL" -le 2 -o "$DEBUGLEVEL" -eq 8 ] && rm $dst return 0 else diff --git a/initramfs/initrd-stuff/etc/messages b/initramfs/initrd-stuff/etc/messages index 5569704d..9e0f0d22 100644 --- a/initramfs/initrd-stuff/etc/messages +++ b/initramfs/initrd-stuff/etc/messages @@ -136,6 +136,8 @@ error_ldapcfg=" The configuration via ldap is not implemented yet." error_errdcfg=" Did not get any configuration data via dhcp until now ..." error_errfcfg=" Did not get any configuration data via tftp until now ..." error_errlcfg=" Did not get any configuration data via ldap until now ..." +unpack_ConfTGZ=" Error during unpacking of the ConfTGZ archive.\nAre you sure \ +it is in proper format?" # messages from distro functions diff --git a/initramfs/initrd-stuff/etc/messages.de b/initramfs/initrd-stuff/etc/messages.de index 3e1dbf91..53269e00 100644 --- a/initramfs/initrd-stuff/etc/messages.de +++ b/initramfs/initrd-stuff/etc/messages.de @@ -141,6 +141,8 @@ error_ldapcfg=" Die Konfiguration via ldap ist noch nicht implementiert." error_errdcfg=" Bis jetzt noch keine Konfigurationsdaten bekommen via dhcp .." error_errfcfg=" Bis jetzt noch keine Konfigurationsdaten bekommen via tftp ..." error_errlcfg=" Bis jetzt noch keine Konfigurationsdaten bekommen via ldap ..." +unpack_ConfTGZ=" Fehler beim entpacken des ConfTGZ.\nSind Sie sicher, dass es im \ +richtigen Format ist?" # messages from distro functions |