This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=18119725a55b359926ad9112e2810b1a32ee98e2 commit 18119725a55b359926ad9112e2810b1a32ee98e2 Author: Guillem Jover <[email protected]> AuthorDate: Fri Dec 27 03:15:53 2019 +0100 dselect: Remove nfs methods There is nothing special about NFS, and mounting these should just be left to the local admin, who can mount any other remote filesystem too. --- debian/changelog | 3 + dselect/methods/Makefile.am | 3 +- dselect/methods/disk/desc.nfs | 9 --- dselect/methods/disk/install | 6 -- dselect/methods/disk/names | 1 - dselect/methods/disk/setup | 113 +-------------------------------- dselect/methods/disk/update | 6 -- dselect/methods/multicd/README.multicd | 2 - dselect/methods/multicd/desc.multi_nfs | 12 ---- dselect/methods/multicd/install | 6 -- dselect/methods/multicd/names | 1 - dselect/methods/multicd/setup | 72 --------------------- dselect/methods/multicd/update | 6 -- 13 files changed, 5 insertions(+), 235 deletions(-) diff --git a/debian/changelog b/debian/changelog index d2e46586b..52797b892 100644 --- a/debian/changelog +++ b/debian/changelog @@ -66,6 +66,9 @@ dpkg (1.20.0) UNRELEASED; urgency=medium to mount any such filesystem on their own, to then use a filesystem method instead. Prompted by Helmut Grohne <[email protected]>. - Remove cdrom method superseded by the multi_cd method. + - Remove nfs methods, as there is nothing special about NFS, and mounting + these should just be left to the local admin, who can mount any other + remote filesystem too. * Perl modules: - Dpkg::Source::Package: Verify original tarball signatures at build time. - Dpkg::BuildFlags: Add new unset() method. diff --git a/dselect/methods/Makefile.am b/dselect/methods/Makefile.am index bb228eac3..dd2143db9 100644 --- a/dselect/methods/Makefile.am +++ b/dselect/methods/Makefile.am @@ -4,14 +4,13 @@ methodsdir = $(pkglibexecdir)/methods nobase_dist_methods_DATA = \ disk/names \ - disk/desc.nfs \ disk/desc.mounted \ ftp/names \ ftp/desc.ftp \ multicd/names \ multicd/desc.multi_cd \ multicd/desc.multi_mount \ - multicd/desc.multi_nfs + $(nil) nobase_methods_SCRIPTS = \ ftp/setup \ diff --git a/dselect/methods/disk/desc.nfs b/dselect/methods/disk/desc.nfs deleted file mode 100644 index 77bb64082..000000000 --- a/dselect/methods/disk/desc.nfs +++ /dev/null @@ -1,9 +0,0 @@ -Installation across the network, from an NFS server which not -currently mounted. - -The server should have contain the Packages.gz file from each -distribution area being installed (usually stable, contrib and -non-free) as well as the corresponding binary/*/*.deb files. - -The easiest way for them to get this is to make a (partial) copy of -the distribution site's directory hierarchy, if possible. diff --git a/dselect/methods/disk/install b/dselect/methods/disk/install index a08de4166..a4d69ad02 100755 --- a/dselect/methods/disk/install +++ b/dselect/methods/disk/install @@ -37,12 +37,6 @@ then mount -rt "$p_fstype" -o nosuid,nodev "$p_blockdev" "$p_mountpoint" fi -if [ -n "$p_nfs" ] -then - umount="$p_mountpoint" - mount -rt nfs "$p_nfs" -o nosuid,nodev "$p_mountpoint" -fi - predep="$vardir/predep-package" while true do diff --git a/dselect/methods/disk/names b/dselect/methods/disk/names index 7e4d27eaf..f474d67ee 100644 --- a/dselect/methods/disk/names +++ b/dselect/methods/disk/names @@ -1,2 +1 @@ -35 nfs Install from an NFS server (not yet mounted). 42 mounted Install from a filesystem which is already mounted. diff --git a/dselect/methods/disk/setup b/dselect/methods/disk/setup index 3190c5998..f05481152 100755 --- a/dselect/methods/disk/setup +++ b/dselect/methods/disk/setup @@ -54,43 +54,6 @@ yesno () { done } -getblockdev () { - mountpoint="$vardir/methods/mnt" - if [ -z "$defaultdevice" ] - then - defaultdevice="$newdefaultdevice" - elif [ "$defaultdevice" != "$newdefaultdevice" ] - then - echo \ - "Last time you specified installation from $defaultdevice." - fi - promptstring="$1" - while [ -z "$blockdevice" ] - do - echo -n "$promptstring [$defaultdevice]: " - read response - if [ -z "$response" ] - then - response="$defaultdevice" - fi - if ! [ -b "$response" ] - then - echo "$response is not a block device."; continue - fi - tryblockdevice="$response" - umount="$mountpoint" - if mount -rt "$fstype" -o nosuid,nodev "$tryblockdevice" "$mountpoint" - then - echo - blockdevice="$tryblockdevice" - else - umount="" - echo \ - "Unable to mount $tryblockdevice on $mountpoint, type $fstype." - fi - done -} - outputparam () { echo "$2" | sed -e "s/'/'\\\\''/; s/^/$1='/; s/$/'/" >&3 } @@ -122,86 +85,15 @@ if [ -f shvar.$option ] then . ./shvar.$option defaultdevice="$p_blockdev" - defaultnfsserver="$p_nfsserver" - defaultnfsrempath="$p_nfsrempath" -fi - -if [ $option = nfs ] -then - mountpoint="$vardir/methods/mnt" - while [ -z "$nfsserver" ] - do - echo -n \ -"What is the name of the NFS server ? [$defaultnfsserver] " - read response - if [ -z "$response" ] && [ -n "$defaultnfsserver" ] - then - response="$defaultnfsserver" - fi - if [ -z "$response" ]; then continue; fi - if [ -x "`which rpcinfo`" ] - then - if rpcinfo -u "$response" mountd | grep -q 'ready' - then - nfsserver="$response" - else - echo "$response appears not to be an NFS server." - fi - elif [ -x "`which ping`" ] - then - if ping -q -c 1 "$response" | grep -q ', 1 packets received' - then - nfsserver="$response" - else - echo "$response appears to be down or nonexistent." - fi - else - echo \ -"(I can't check that now because there is no rpcinfo or ping.)" - nfsserver="$response" - fi - done - while [ -z "$nfsrempath" ] - do - echo -n " -What is the pathname on the NFS server of the filesystem with -the Debian files? [$defaultnfsrempath] " - read response - if [ -z "$response" ] && [ -n "$defaultnfsrempath" ] - then - response="$defaultnfsrempath" - else - response="`echo \"$response\" | sed -e 's:/$::; s:^/*:/:'`" - fi - umount="$mountpoint" - if mount -rt nfs -o nosuid,nodev "$nfsserver:$response" "$mountpoint" - then - echo - nfsrempath="$response" - else - umount="" - echo \ -"Unable to mount NFS filesystem $nfsserver:$response." - fi - done - nfs="$nfsserver:$nfsrempath" fi if [ -n "$mountpoint" ] then # We must have $mountpoint - if [ $option = nfs ] - then - echo \ -"All directory names should be entered relative to the root of the NFS -filesystem, ie relative to $nfsrempath on the server. -" - else - echo \ + echo \ "All directory names should be entered relative to the root of the $fstype filesystem on $blockdevice. " - fi fi while true @@ -403,9 +295,6 @@ exec 3>shvar.$option.new outputparam p_blockdev "$blockdevice" outputparam p_fstype "$fstype" outputparam p_mountpoint "$mountpoint" -outputparam p_nfsserver "$nfsserver" -outputparam p_nfsrempath "$nfsrempath" -outputparam p_nfs "$nfs" outputparam p_hierbase "$hierbase" outputparam p_main_packages "$main_packages" diff --git a/dselect/methods/disk/update b/dselect/methods/disk/update index ff7ad3404..b77ce27a7 100755 --- a/dselect/methods/disk/update +++ b/dselect/methods/disk/update @@ -48,12 +48,6 @@ then mount -rt "$p_fstype" -o nosuid,nodev "$p_blockdev" "$p_mountpoint" fi -if [ -n "$p_nfs" ] -then - umount="$p_mountpoint" - mount -rt nfs "$p_nfs" -o nosuid,nodev "$p_mountpoint" -fi - updatetype=update for f in main ctb nf lcl diff --git a/dselect/methods/multicd/README.multicd b/dselect/methods/multicd/README.multicd index 19e5660f2..859807883 100644 --- a/dselect/methods/multicd/README.multicd +++ b/dselect/methods/multicd/README.multicd @@ -8,8 +8,6 @@ Installation methods for multiple binary CDs . Multiple binary CD-ROMs - . Multiple binary CD-ROMs, accessed through NFS - . Multiple binary CD-ROMs, pre-mounted Acquiring package data diff --git a/dselect/methods/multicd/desc.multi_nfs b/dselect/methods/multicd/desc.multi_nfs deleted file mode 100644 index e63a8ab06..000000000 --- a/dselect/methods/multicd/desc.multi_nfs +++ /dev/null @@ -1,12 +0,0 @@ -Installation across the network, from an NFS server which is not -currently mounted. - -The server should contain the Packages.gz file from each distribution -area being installed (usually main, contrib, non-free and local) - as well as the corresponding binary/*/*.deb files. - -The easiest way for them to get this is to make a (partial) copy of -the distribution site's directory hierarchy, if possible. - -The contents of the mounted directory may change. Thus it's possible -to use this method for installations from a CDROM set. diff --git a/dselect/methods/multicd/install b/dselect/methods/multicd/install index 6db59824d..14469eb1b 100755 --- a/dselect/methods/multicd/install +++ b/dselect/methods/multicd/install @@ -81,12 +81,6 @@ do_mount() { umount="$p_mountpoint" echo mount -rt iso9660 -o nosuid,nodev${loop} "$p_blockdev" "$p_mountpoint"\; umount="$p_mountpoint" fi - - if [ -n "$p_nfs" ] - then - umount="$p_mountpoint" - echo mount -rt nfs "$p_nfs" -o nosuid,nodev "$p_mountpoint"\; umount="$p_mountpoint" - fi } trap 'eval `do_umount`; exit $xit' 0 diff --git a/dselect/methods/multicd/names b/dselect/methods/multicd/names index 4a74be157..b3e5257a3 100644 --- a/dselect/methods/multicd/names +++ b/dselect/methods/multicd/names @@ -1,3 +1,2 @@ 31 multi_cd Install from a CD-ROM set. -36 multi_nfs Install from an NFS server (using the CD-ROM set) (not yet mounted). 46 multi_mount Install from a mounted partition with changing contents. diff --git a/dselect/methods/multicd/setup b/dselect/methods/multicd/setup index 9badab318..47c16e077 100755 --- a/dselect/methods/multicd/setup +++ b/dselect/methods/multicd/setup @@ -161,8 +161,6 @@ if [ -f shvar.$option ] then . ./shvar.$option defaultdevice="$p_blockdev" - defaultnfsserver="$p_nfsserver" - defaultnfsrempath="$p_nfsrempath" usedevel="$p_usedevel" fi @@ -233,67 +231,6 @@ then fi fi -if [ $option = multi_nfs ] -then - mountpoint="$vardir/methods/mnt" - while [ -z "$nfsserver" ] - do - echo -n \ -"What is the name of the NFS server ? [$defaultnfsserver] " - read response - if [ -z "$response" -a -n "$defaultnfsserver" ] - then - response="$defaultnfsserver" - fi - if [ -z "$response" ]; then continue; fi - if [ -x "`which rpcinfo`" ] - then - if rpcinfo -u "$response" mountd >/dev/null - then - nfsserver="$response" - else - echo "$response appears not to be an NFS server." - fi - elif [ -x "`which ping`" ] - then - if ping -q -c 1 "$response" | grep -q ', 1 packets received' - then - nfsserver="$response" - else - echo "$response appears to be down or nonexistent." - fi - else - echo \ -"(I can't check that now because there is no rpcinfo or ping.)" - nfsserver="$response" - fi - done - while [ -z "$nfsrempath" ] - do - echo -n " -What is the pathname on the NFS server of the filesystem with -the Debian files ? [$defaultnfsrempath] " - read response - if [ -z "$response" -a -n "$defaultnfsrempath" ] - then - response="$defaultnfsrempath" - else - response="`echo \"$response\" | sed -e 's:/$::; s:^/*:/:'`" - fi - umount="$mountpoint" - if mount -rt nfs -o nosuid,nodev "$nfsserver:$response" "$mountpoint" - then - echo - nfsrempath="$response" - else - umount="" - echo \ -"Unable to mount NFS filesystem $nfsserver:$response." - fi - done - nfs="$nfsserver:$nfsrempath" -fi - if [ -n "$mountpoint" ] then # We must have $mountpoint @@ -302,12 +239,6 @@ then echo \ 'All directory names should be entered relative to the root of the CD-ROM. ' - elif [ $option = multi_nfs ] - then - echo \ -"All directory names should be entered relative to the root of the NFS -filesystem, ie relative to $nfsrempath on the server. -" else echo \ "All directory names should be entered relative to the root of the @@ -585,9 +516,6 @@ exec 3>shvar.$option.new outputparam p_blockdev "$blockdevice" outputparam p_fstype "$fstype" outputparam p_mountpoint "$mountpoint" -outputparam p_nfsserver "$nfsserver" -outputparam p_nfsrempath "$nfsrempath" -outputparam p_nfs "$nfs" outputparam p_hierbase "$hierbase" outputparam p_usedevel "$usedevel" outputparam p_main_packages "$main_packages" diff --git a/dselect/methods/multicd/update b/dselect/methods/multicd/update index 0701ef051..a2261d706 100755 --- a/dselect/methods/multicd/update +++ b/dselect/methods/multicd/update @@ -71,12 +71,6 @@ then mount -rt "$p_fstype" -o nosuid,nodev${loop} "$p_blockdev" "$p_mountpoint" fi -if [ -n "$p_nfs" ] -then - umount="$p_mountpoint" - mount -rt nfs "$p_nfs" -o nosuid,nodev "$p_mountpoint" -fi - updatetype=update if [ -z "$p_multi" ]; then -- Dpkg.Org's dpkg
