Re: install/57593: xz is missing from the rescue set

[Pierre Pronchery <khorben%defora.org@localhost>]

The following reply was made to PR install/57593; it has been noted by GNATS.

From: Pierre Pronchery <khorben%defora.org@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: 
Subject: Re: install/57593: xz is missing from the rescue set
Date: Mon, 4 Sep 2023 02:03:31 +0200

 --Apple-Mail=_5C20C9E1-6419-46D9-876D-F5F5684A5081
 Content-Transfer-Encoding: quoted-printable
 Content-Type: text/plain;
 	charset=utf-8
 
 			Hi,
 
 > On 26. Aug 2023, at 06:55, Michael van Elst <mlelstv%serpens.de@localhost> =
 wrote:
 >=20
 > The following reply was made to PR install/57593; it has been noted by =
 GNATS.
 >=20
 > From: mlelstv%serpens.de@localhost (Michael van Elst)
 > To: gnats-bugs%netbsd.org@localhost
 > Cc:=20
 > Subject: Re: install/57593: xz is missing from the rescue set
 > Date: Sat, 26 Aug 2023 04:52:27 -0000 (UTC)
 >=20
 > khorben%defora.org@localhost (Pierre Pronchery) writes:
 >=20
 >> On platforms where sets are distributed as xz files (amd64, sparc64, =
 and
 >> aarch64 AFAICT) there is no way to uncompress the sets from the tools
 >> available in /rescue. I think this is quite inconvenient, especially
 >> since gz is available there (as expected).
 >=20
 > =46rom gzip(1):
 >      This version of gzip is also capable of decompressing files =
 compressed
 >      using compress(1), bzip2(1), lzip, or xz(1).
 >=20
 > and that's also true for the version built for /rescue.
 
 Thanks, I had forgotten about that during the rescue operation. Still I =
 think that improvements are possible with regards to this process:
 
 - linking lzmadec, uncompress, and xzdec binaries to gzip in /rescue =
 (patch attached)
 - when calling /rescue/tar xzvf on a .tar.xz file, I get: (simulating a =
 situation without working /bin or /usr)
 
 # file test.tar.xz
 test.tar.xz: XZ compressed data
 # PATH=3D /rescue/tar -xzvf test.tar.xz                                  =
                                                                          =
                                                                          =
                                               =20
 tar: could not exec: No such file or directory
 tar: End of archive volume 1 reached
 tar: Sorry, unable to determine archive format.
 
   =E2=80=A6which is what got me confused originally.
 
 Therefore I think we should ship /rescue/tar so that it defaults to the =
 binaries available in /rescue, regardless of what $PATH says.
 
 Can I commit this patch, and would it make sense to modify /rescue/tar =
 this way?
 
 
 --Apple-Mail=_5C20C9E1-6419-46D9-876D-F5F5684A5081
 Content-Disposition: attachment;
 	filename=patch-rescue_lzmadec_uncompress_xzdec.diff
 Content-Type: application/octet-stream;
 	x-unix-mode=0600;
 	name="patch-rescue_lzmadec_uncompress_xzdec.diff"
 Content-Transfer-Encoding: 7bit
 
 diff --git a/distrib/sets/lists/rescue/mi b/distrib/sets/lists/rescue/mi
 index 7ac808e44b4f..e06aeb5d6420 100644
 --- a/distrib/sets/lists/rescue/mi
 +++ b/distrib/sets/lists/rescue/mi
 @@ -74,6 +74,7 @@
  ./rescue/lmcctl					base-obsolete	obsolete
  ./rescue/ln					base-rescue-root
  ./rescue/ls					base-rescue-root
 +./rescue/lzmadec				base-rescue-root
  ./rescue/mbrlabel				base-rescue-root
  ./rescue/mkdir					base-rescue-root
  ./rescue/mknod					base-rescue-root
 @@ -157,12 +158,14 @@
  ./rescue/tunefs					base-rescue-root
  ./rescue/umbctl					base-rescue-root
  ./rescue/umount					base-rescue-root
 +./rescue/uncompress				base-rescue-root
  ./rescue/veriexecctl				base-rescue-root
  ./rescue/vi					base-rescue-root
  ./rescue/vnconfig				base-rescue-root
  ./rescue/vndconfig				base-rescue-root
  ./rescue/wdogctl				base-rescue-root
  ./rescue/wsconsctl				base-rescue-root
 +./rescue/xzdec					base-rescue-root
  ./rescue/zcat					base-rescue-root
  ./rescue/zegrep					base-rescue-root
  ./rescue/zfgrep					base-rescue-root
 diff --git a/rescue/list b/rescue/list
 index 9e0575a91eeb..8998ebf53216 100644
 --- a/rescue/list
 +++ b/rescue/list
 @@ -124,7 +124,7 @@ SRCDIRS	usr.bin
  PROG	bzip2		bunzip2 bzcat
  PROG	ftp
  PROG	grep		egrep fgrep zgrep zegrep zfgrep
 -PROG	gzip		gunzip gzcat zcat 
 +PROG	gzip		gunzip gzcat lzmadec uncompress xzdec zcat
  PROG	kdump
  PROG	ktrace
  PROG	ktruss
 
 --Apple-Mail=_5C20C9E1-6419-46D9-876D-F5F5684A5081
 Content-Transfer-Encoding: 7bit
 Content-Type: text/plain;
 	charset=us-ascii
 
 
 
 Cheers & HTH,
 -- 
 khorben
 --Apple-Mail=_5C20C9E1-6419-46D9-876D-F5F5684A5081--