From 63ff96ccda6a0d27e8874d0bb0356c42deb3eff3 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 8 Dec 2016 12:58:51 +0000
Subject: [PATCH] customize: Remove Customize_utils module.

After the previous commit this module is empty, so remove it.
---
 customize/Makefile.am        |  1 -
 customize/customize_main.ml  |  1 -
 customize/customize_run.ml   |  1 -
 customize/customize_utils.ml | 23 -----------------------
 customize/firstboot.ml       |  1 -
 customize/password.ml        |  2 --
 customize/ssh_key.ml         |  2 --
 customize/timezone.ml        |  2 --
 generator/customize.ml       |  2 --
 po/POTFILES-ml               |  1 -
 v2v/Makefile.am              |  1 -
 11 files changed, 37 deletions(-)
 delete mode 100644 customize/customize_utils.ml

diff --git a/customize/Makefile.am b/customize/Makefile.am
index f2e1c151c..808f86fd0 100644
--- a/customize/Makefile.am
+++ b/customize/Makefile.am
@@ -52,7 +52,6 @@ SOURCES_MLI = \
 
 # This list must be in dependency order.
 SOURCES_ML = \
-	customize_utils.ml \
 	append_line.ml \
 	crypt.ml \
 	firstboot.ml \
diff --git a/customize/customize_main.ml b/customize/customize_main.ml
index 56132775c..5b4641237 100644
--- a/customize/customize_main.ml
+++ b/customize/customize_main.ml
@@ -20,7 +20,6 @@ open Common_gettext.Gettext
 open Common_utils
 open Getopt.OptionName
 
-open Customize_utils
 open Customize_cmdline
 
 open Printf
diff --git a/customize/customize_run.ml b/customize/customize_run.ml
index 9ec7b5a52..32a202790 100644
--- a/customize/customize_run.ml
+++ b/customize/customize_run.ml
@@ -22,7 +22,6 @@ open Printf
 open Common_gettext.Gettext
 open Common_utils
 
-open Customize_utils
 open Customize_cmdline
 open Password
 open Append_line
diff --git a/customize/customize_utils.ml b/customize/customize_utils.ml
deleted file mode 100644
index feb4a1641..000000000
--- a/customize/customize_utils.ml
+++ /dev/null
@@ -1,23 +0,0 @@
-(* virt-customize
- * Copyright (C) 2013-2016 Red Hat Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *)
-
-(* Utilities/common functions used in virt-customize only. *)
-
-open Printf
-
-open Common_utils
diff --git a/customize/firstboot.ml b/customize/firstboot.ml
index f7213bcc8..34e58a037 100644
--- a/customize/firstboot.ml
+++ b/customize/firstboot.ml
@@ -21,7 +21,6 @@ open Printf
 open Common_utils
 open Common_gettext.Gettext
 
-open Customize_utils
 open Regedit
 
 let unix2dos s =
diff --git a/customize/password.ml b/customize/password.ml
index 8a9fed3e1..fbd42a82b 100644
--- a/customize/password.ml
+++ b/customize/password.ml
@@ -19,8 +19,6 @@
 open Common_gettext.Gettext
 open Common_utils
 
-open Customize_utils
-
 open Printf
 
 type password_crypto = [`MD5 | `SHA256 | `SHA512 ]
diff --git a/customize/ssh_key.ml b/customize/ssh_key.ml
index d05816c71..41f900af1 100644
--- a/customize/ssh_key.ml
+++ b/customize/ssh_key.ml
@@ -19,8 +19,6 @@
 open Common_gettext.Gettext
 open Common_utils
 
-open Customize_utils
-
 open Printf
 open Sys
 open Unix
diff --git a/customize/timezone.ml b/customize/timezone.ml
index be5e41d7e..bc40d6e3e 100644
--- a/customize/timezone.ml
+++ b/customize/timezone.ml
@@ -18,8 +18,6 @@
 
 open Common_utils
 
-open Customize_utils
-
 open Printf
 
 let set_timezone (g : Guestfs.guestfs) root timezone =
diff --git a/generator/customize.ml b/generator/customize.ml
index 129a46089..96aa22d15 100644
--- a/generator/customize.ml
+++ b/generator/customize.ml
@@ -627,8 +627,6 @@ open Common_utils
 open Common_gettext.Gettext
 open Getopt.OptionName
 
-open Customize_utils
-
 ";
   generate_ops_struct_decl ();
   pr "\n";
diff --git a/po/POTFILES-ml b/po/POTFILES-ml
index e9827f253..3ec812a6c 100644
--- a/po/POTFILES-ml
+++ b/po/POTFILES-ml
@@ -22,7 +22,6 @@ customize/crypt.ml
 customize/customize_cmdline.ml
 customize/customize_main.ml
 customize/customize_run.ml
-customize/customize_utils.ml
 customize/firstboot.ml
 customize/hostname.ml
 customize/password.ml
diff --git a/v2v/Makefile.am b/v2v/Makefile.am
index 2802056d5..cbb974fe4 100644
--- a/v2v/Makefile.am
+++ b/v2v/Makefile.am
@@ -122,7 +122,6 @@ virt_v2v_CFLAGS = \
 	$(LIBVIRT_CFLAGS)
 
 BOBJECTS = \
-	$(top_builddir)/customize/customize_utils.cmo \
 	$(top_builddir)/customize/firstboot.cmo \
 	$(top_builddir)/customize/SELinux_relabel.cmo \
 	$(SOURCES_ML:.ml=.cmo)