From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: cleanup: remove unused mk_sysprep_floppy
......................................................................
cleanup: remove unused mk_sysprep_floppy
Change I27f176378 dropped the code calling this helper script.
There is no need to keep it behind.
Change-Id: I3016d7bdcbefedd3501abbe92b29637db59c13b5
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M .gitignore
M lib/vdsm/constants.py.in
M static/etc/sudoers.d/50_vdsm.in
R static/libexec/vdsm/mk_sysprep_floppy.in
M vdsm.spec.in
M vdsm/Makefile.am
6 files changed, 1 insertion(+), 9 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/84/78584/1
diff --git a/.gitignore b/.gitignore
index 88b34f4..7251e4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,7 +71,6 @@
tests/other.key
vdsm-*.tar.gz
vdsm.spec
-vdsm/mk_sysprep_floppy
vdsm/sos/vdsm.py
vdsm/vdscli.py
vdsm/vdsm-gencerts.sh
diff --git a/lib/vdsm/constants.py.in b/lib/vdsm/constants.py.in
index 950c70d..18d71b2 100644
--- a/lib/vdsm/constants.py.in
+++ b/lib/vdsm/constants.py.in
@@ -125,7 +125,6 @@
EXT_MKFS = '@MKFS_PATH@'
EXT_MKFS_MSDOS = '@MKFS_MSDOS_PATH@'
EXT_MKISOFS = '@MKISOFS_PATH@'
-EXT_MK_SYSPREP_FLOPPY = '@VDSMDIR@/mk_sysprep_floppy' # NOQA: E501 (potentially
long line)
EXT_MOUNT = '@MOUNT_PATH@'
EXT_MULTIPATH = '@MULTIPATH_PATH@'
diff --git a/static/etc/sudoers.d/50_vdsm.in b/static/etc/sudoers.d/50_vdsm.in
index c88ac8d..26e4da1 100644
--- a/static/etc/sudoers.d/50_vdsm.in
+++ b/static/etc/sudoers.d/50_vdsm.in
@@ -1,6 +1,5 @@
Cmnd_Alias VDSM_LIFECYCLE = \
- @DMIDECODE_PATH@ -s system-uuid, \
- @VDSMDIR@/mk_sysprep_floppy
+ @DMIDECODE_PATH@ -s system-uuid
Cmnd_Alias VDSM_STORAGE = \
@FSCK_PATH@ -p *, \
@TUNE2FS_PATH@ -j *, \
diff --git a/vdsm/mk_sysprep_floppy.in b/static/libexec/vdsm/mk_sysprep_floppy.in
similarity index 100%
rename from vdsm/mk_sysprep_floppy.in
rename to static/libexec/vdsm/mk_sysprep_floppy.in
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 168bf2b..1a0c08a 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -891,7 +891,6 @@
%{_datadir}/%{vdsm_name}/daemonAdapter
%{_datadir}/%{vdsm_name}/API.py*
%{_datadir}/%{vdsm_name}/hooking.py*
-%{_datadir}/%{vdsm_name}/mk_sysprep_floppy
%{_datadir}/%{vdsm_name}/sitecustomize.py*
%{_datadir}/%{vdsm_name}/supervdsmd
%{_datadir}/%{vdsm_name}/vdsmd
diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am
index 3df78ed..abeaf62 100644
--- a/vdsm/Makefile.am
+++ b/vdsm/Makefile.am
@@ -34,9 +34,6 @@
vdsm-gencerts.sh \
$(NULL)
-nodist_vdsm_SCRIPTS = \
- mk_sysprep_floppy
-
dist_vdsm_SCRIPTS = \
get-conf-item \
set-conf-item \
@@ -54,7 +51,6 @@
EXTRA_DIST = \
dhclientmon.sh \
libvirt_password \
- mk_sysprep_floppy.in \
vdsm-gencerts.sh.in \
vdsm-libvirt-access.pkla \
vdsm-libvirt-access.rules \
--
To view, visit
https://gerrit.ovirt.org/78584
To unsubscribe, visit
https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3016d7bdcbefedd3501abbe92b29637db59c13b5
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>