[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#623981: 90linux-distro: 132: Syntax error: end of file unexpected (expecting "fi")



Package: os-prober
Version: 1.45
Severity: important
Tags: patch

Hi

90linux-distro: fix sh syntax for "Linux from scratch" detection.

Upgrading os-prober to 1.45 results in the following error message upon
invoking update-grub (and prevents later scripts from getting 
executed).

# update-grub
Generating grub.cfg ...
Found linux image: /boot/vmlinuz-[...]
Found initrd image: /boot/initrd.img-[...]
/usr/lib/os-probes/mounted/90linux-distro: 132: Syntax error: end of file unexpected (expecting "fi")
/usr/lib/os-probes/mounted/90linux-distro: 132: Syntax error: end of file unexpected (expecting "fi")
/usr/lib/os-probes/mounted/90linux-distro: 132: Syntax error: end of file unexpected (expecting "fi")
/usr/lib/os-probes/mounted/90linux-distro: 132: Syntax error: end of file unexpected (expecting "fi")
/usr/lib/os-probes/mounted/90linux-distro: 132: Syntax error: end of file unexpected (expecting "fi")
/usr/lib/os-probes/mounted/90linux-distro: 132: Syntax error: end of file unexpected (expecting "fi")
/usr/lib/os-probes/mounted/90linux-distro: 132: Syntax error: end of file unexpected (expecting "fi")
[...]

Signed-off-by: Stefan Lippers-Hollmann <s.l-h@gmx.de>
---
 os-probes/mounted/common/90linux-distro |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -Nru a/os-probes/mounted/common/90linux-distro b/os-probes/mounted/common/90linux-distro
--- a/os-probes/mounted/common/90linux-distro
+++ b/os-probes/mounted/common/90linux-distro
@@ -115,7 +115,7 @@
 	elif [ -e "$dir/etc/kdemar-release" ]; then
 		short="K-DEMar"
 		long="$(printf "K-DEMar GNU/Linux (%s)\n" "$(cat "$dir/etc/kdemar-release")")"
-	if [ -e "$dir/etc/lfs-release" ]; then
+	elif [ -e "$dir/etc/lfs-release" ]; then
 		short="LFS"
 		long="$(printf "Linux From Scratch (%s)\n" "$(cat "$dir/etc/lfs-release")")"
 	else
-- 

-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.38-4.slh.2-aptosid-amd64 (SMP w/2 CPU cores; PREEMPT)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages os-prober depends on:
ii  libc6                         2.11.2-13  Embedded GNU C Library: Shared lib

os-prober recommends no packages.

os-prober suggests no packages.

-- no debconf information



Reply to: