summaryrefslogtreecommitdiff
path: root/source/a/lilo/lilo.allow.colons.in.by-id.diff
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2018-05-28 19:12:29 +0000
committerEric Hameleers <alien@slackware.com>2018-05-31 23:39:35 +0200
commit646a5c1cbfd95873950a87b5f75d52073a967023 (patch)
treeb8b8d2ab3b0d432ea69ad1a64d1c789649d65020 /source/a/lilo/lilo.allow.colons.in.by-id.diff
parentd31c50870d0bee042ce660e445c9294a59a3a65b (diff)
downloadcurrent-646a5c1cbfd95873950a87b5f75d52073a967023.tar.gz
Mon May 28 19:12:29 UTC 201820180528191229
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/a/lilo/lilo.allow.colons.in.by-id.diff')
-rw-r--r--source/a/lilo/lilo.allow.colons.in.by-id.diff30
1 files changed, 30 insertions, 0 deletions
diff --git a/source/a/lilo/lilo.allow.colons.in.by-id.diff b/source/a/lilo/lilo.allow.colons.in.by-id.diff
new file mode 100644
index 00000000..1bb0d990
--- /dev/null
+++ b/source/a/lilo/lilo.allow.colons.in.by-id.diff
@@ -0,0 +1,30 @@
+From alex14641 on LQ:
+http://www.linuxquestions.org/questions/slackware-14/requests-for-current-20151216-a-4175561577/page142.html#post5686598
+
+On my system, the Sandisk Cruzer USB Stick has file names in /dev/disk/by-id/, that contain
+colons: this causes lilo to fail when using one of these files as a boot disk. This patch
+replaces the failure with a warning.
+
+--- ./src/geometry.c.orig 2015-11-21 17:50:18.000000000 -0600
++++ ./src/geometry.c 2017-03-23 15:30:53.925990587 -0500
+@@ -1357,16 +1357,12 @@
+
+ int geo_open(GEOMETRY *geo,const char *name,int flags)
+ {
+- char *here;
+- int user_dev,block_size;
++ int user_dev = -1,block_size;
+ struct stat st;
+
+- if ((here = strrchr(name,':')) == NULL) user_dev = -1;
+- else {
+- *here++ = 0;
+- warn("%s:BIOS syntax is no longer supported.\n Please use a "
+- "DISK section.", name);
+- user_dev = to_number(here);
++ if (strrchr(name,':') != NULL) {
++ warn("%s:BIOS syntax is no longer supported: "
++ "Treating as a device file.", name);
+ }
+ if ((geo->fd = open(name,flags)) < 0)
+ die("open %s: %s",name,strerror(errno));