Question: is there any automated way of building rpm package?
by HATAYAMA Daisuke
Hello,
Is there any automated way of building rpm package?
That is, installing files such eppic, kexec-tools-po, makedumpfile and kexec-tools with expected file names necessary for installation, place them proper file path location and then execute rpmbuild command.
I first found out there's no Makefile and INSTALL file, and then I tried preparing them manually in an ad-hoc way, but faced build failure several times and gave up.
--
Thanks.
HATAYAMA, Daisuke
7 years, 12 months
[PATCH v3] kdump-module-setup.sh: Handle static IPs defined in NetworkManager gui
by Marc Milgram
NetworkManager changed the format of ifcfg-device files. They may define
static IP addresses with the following format:
IPADDR0=192.168.122.100
PREFIX0=24
There may be up to 255 ip addresses for a network device - each with a unique
number tagged to the end of IPADDR and PREFIX.
Prior to this fix, kdump only handled static ip addresses defined with
IPADDR=192.168.122.100
PREFIX=24
ie. without the number.
The solution is to use "ip" commands to find the correct network information.
Tested with both static and dynamic IP addresses.
v2: Fixed a local variable that was set incorrectly
v3: Fix iscsi case
Signed-off-by: Marc Milgram <mmilgram(a)redhat.com>
---
diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh
index 2a16900..87ad072 100755
--- a/dracut-module-setup.sh
+++ b/dracut-module-setup.sh
@@ -67,14 +67,17 @@ kdump_setup_dns() {
}
#$1: netdev name
-#checking /etc/sysconfig/network-scripts/ifcfg-$1,
+#$2: srcaddr
#if it use static ip echo it, or echo null
kdump_static_ip() {
- . /etc/sysconfig/network-scripts/ifcfg-$1
- if [ -n "$IPADDR" ]; then
- [ -z "$NETMASK" -a -n "$PREFIX" ] && \
- NETMASK=$(ipcalc -m $IPADDR/$PREFIX | cut -d'=' -f2)
- echo -n "${IPADDR}::${GATEWAY}:${NETMASK}::"
+ local _netmask _gateway
+ local _netdev="$1" _srcaddr="$2"
+ local _ipaddr=$(ip addr show dev $_netdev permanent | \
+ awk "/ $_srcaddr\/.* $_netdev\$/{print \$2}")
+ if [ -n "$_ipaddr" ]; then
+ _netmask=$(ipcalc -m $_ipaddr | cut -d'=' -f2)
+ _gateway=$(ip route list dev $_netdev | awk '/^default /{print $3}')
+ echo -n "${_srcaddr}::${_gateway}:${_netmask}::"
fi
}
@@ -181,7 +184,7 @@ kdump_setup_znet() {
# Setup dracut to bringup a given network interface
kdump_setup_netdev() {
- local _netdev=$1
+ local _netdev=$1 _srcaddr=$2
local _static _proto _ip_conf _ip_opts _ifname_opts
if [ "$(uname -m)" = "s390x" ]; then
@@ -189,7 +192,7 @@ kdump_setup_netdev() {
fi
_netmac=$(kdump_get_mac_addr $_netdev)
- _static=$(kdump_static_ip $_netdev)
+ _static=$(kdump_static_ip $_netdev $_srcaddr)
if [ -n "$_static" ]; then
_proto=none
else
@@ -223,8 +226,9 @@ kdump_setup_netdev() {
#Function:kdump_install_net
#$1: config values of net line in kdump.conf
+#$2: srcaddr of network device
kdump_install_net() {
- local _server _netdev
+ local _server _netdev _srcaddr
local config_val="$1"
_server=`echo $config_val | sed 's/.*@//' | cut -d':' -f1`
@@ -239,13 +243,15 @@ kdump_install_net() {
if [ -n "`echo $_netdev | grep via`" ]
then
# we are going to a different subnet
+ _srcaddr=`echo $_netdev|awk '{print $7}'|head -n 1`
_netdev=`echo $_netdev|awk '{print $5;}'|head -n 1`
else
# we are on the same subnet
+ _srcaddr=`echo $_netdev|awk '{print $5}'|head -n 1`
_netdev=`echo $_netdev|awk '{print $3}'|head -n 1`
fi
- kdump_setup_netdev "${_netdev}"
+ kdump_setup_netdev "${_netdev}" "${_srcaddr}"
#save netdev used for kdump as cmdline
# Whoever calling kdump_install_net() is setting up the default gateway,
@@ -364,6 +370,7 @@ kdump_setup_iscsi_device() {
local username; local password; local userpwd_str;
local username_in; local password_in; local userpwd_in_str;
local netdev
+ local srcaddr
local idev
local netroot_str ; local initiator_str;
local netroot_conf="${initdir}/etc/cmdline.d/50iscsi.conf"
@@ -398,9 +405,11 @@ kdump_setup_iscsi_device() {
[ -n "$username_in" ] && userpwd_in_str=":$username_in:$password_in"
netdev=$(/sbin/ip route get to ${tgt_ipaddr} | \
- sed 's|.*dev \(.*\).*|\1|g' | awk '{ print $1; exit }')
+ sed 's|.*dev \(.*\).*|\1|g')
+ srcaddr=$(echo $netdev | awk '{ print $3; exit }')
+ netdev=$(echo $netdev | awk '{ print $1; exit }')
- kdump_setup_netdev $netdev
+ kdump_setup_netdev $netdev $srcaddr
# prepare netroot= command line
# FIXME: IPV6 addresses require explicit [] around $tgt_ipaddr
8 years, 11 months
[PATCH] kdumpctl: time out after 180 seconds when connecting to ssh host
by WANG Chao
When starting kdump service with dump target being ssh host, after
network-online.target, we connect to ssh host and touch the dump
directory to make sure the host is ready to be dumped to.
Chances are after network-online.target, the particular network resource
we interest in isn't ready for connecting to the specified ssh host.
And at that time, we connect to ssh host and fail.
What we should do is to wait for the specific network resource, not
totally depending on network-online.target. But it's relatively
complicated to implement. A simple and direct solution would be try as
many time as it needs to connect to the configured ssh host. However to
avoid a infinitely loop, we time out and fail. I set this time out value
to be 180 seconds, and general speaking, 180 seconds would be enough for
almost any kind of network to be up and ready.
Signed-off-by: WANG Chao <chaowang(a)redhat.com>
---
kdumpctl | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/kdumpctl b/kdumpctl
index 9cae0c4..0bd6021 100755
--- a/kdumpctl
+++ b/kdumpctl
@@ -381,8 +381,19 @@ function check_ssh_config()
function check_ssh_target()
{
local _ret
- ssh -q -i $SSH_KEY_LOCATION -o BatchMode=yes $DUMP_TARGET mkdir -p $SAVE_PATH
- _ret=$?
+ local _start _delta
+
+ # Timeout out after 180 seconds, hopefully it's enough.
+ _start=$(date +%s)
+ while : ; do
+ ssh -q -i $SSH_KEY_LOCATION -o BatchMode=yes $DUMP_TARGET mkdir -p $SAVE_PATH
+ _ret=$?
+ _delta=$(($(date +%s) - $_start))
+ if [[ $_ret -eq 0 || $_delta -gt 180 ]]; then
+ break
+ fi
+ done
+
if [ $_ret -ne 0 ]; then
echo "Could not create $DUMP_TARGET:$SAVE_PATH, you probably need to run \"kdumpctl propagate\"" >&2
return 1
--
1.9.3
9 years
[PATCH v4 0/8] kdump: Modify kdump init script to support firmware-assisted dump
by Hari Bathini
This patch set implements firmware-assisted dump support for kdump
service. Firmware-assisted dump support depends on existing kdump
infrastructure (kdump scripts) present in userland to save dump
to the disk. Though existing kdump script will work seemlessly, it
still needs to modified to make it aware of presense of firmware-
assisted dump feature during service start and stop. These changes
are tested successfully on a power box with fedora19.
Changes in v4:
1. Using a global variable DUMP_MODE to store current dump mode.
2. Updated the fadump-howto.txt doc based on review comments.
---
Hari Bathini (8):
kdump: Modify status routine to check for firmware-assisted dump
kdump: Modify kdump script to start the firmware assisted dump.
kdump: Modify kdump script to stop firmware assisted dump
kdump: Take a backup of original default initrd before rebuilding.
kdump: Rebuild default initrd for firmware assisted dump
kdump: Get rid of "function" keyword from all functions
kdump: Check for /proc/vmcore existence before capturing the vmcore.
kdump: Add firmware-assisted dump howto document
dracut-kdump.sh | 3 +
fadump-howto.txt | 250 +++++++++++++++++++++++++++++++++++++++++++
kdumpctl | 312 ++++++++++++++++++++++++++++++++++++++++++++++--------
3 files changed, 516 insertions(+), 49 deletions(-)
create mode 100644 fadump-howto.txt
--
-Hari
9 years
[PATCH v2] Modify dracut-kdump.sh and dracut-module-setup.sh to support ipv6 nfs dump
by Arthur Zou
Resolves: bz821620
Currently dracut has supported for ipv6, and it is a significant feture for
kdump to enhance to support ipv6.
For ipv6 nfs dump:
if ipv6 address type is link scope, /etc/kdump.conf should be edited like
"nfs [fe80::5054:ff:fe48:ca80%eth0]:/mnt"
else /etc/kdump.conf should be edited like "nfs [2001:db8:0:f101::2]:/mnt"
For ipv6 ssh dump
if ipv6 address type is link scope, /etc/kdump.conf should be edited like
"ssh root@fe80::5054:ff:fe48:ca80%eth0"
else /etc/kdump.conf should be edited like "ssh root@2001:db8:0:f101::2"
Signed-off-by: Arthur Zou <zzou(a)redhat.com>
---
dracut-kdump.sh | 10 ++++++++--
dracut-module-setup.sh | 34 ++++++++++++++++++++++++++--------
kdump-lib.sh | 17 +++++++++++++++++
3 files changed, 51 insertions(+), 10 deletions(-)
diff --git a/dracut-kdump.sh b/dracut-kdump.sh
index cb13d92..c215bee 100755
--- a/dracut-kdump.sh
+++ b/dracut-kdump.sh
@@ -206,10 +206,16 @@ get_host_ip()
then
kdumpnic=$(getarg kdumpnic=)
[ -z "$kdumpnic" ] && echo "kdump: failed to get kdumpnic!" && return 1
- _host=`ip addr show dev $kdumpnic|grep 'inet '`
+ if is_ipv6_target
+ then
+ _host=`ip addr show dev $kdumpnic|grep 'inet6'`
+ else
+ _host=`ip addr show dev $kdumpnic|grep 'inet '`
+ fi
[ $? -ne 0 ] && echo "kdump: wrong kdumpnic: $kdumpnic" && return 1
- _host="${_host##*inet }"
+ _host="${_host#*inet}"
_host="${_host%%/*}"
+ _host=`echo $_host | cut -d' ' -f2`
[ -z "$_host" ] && echo "kdump: wrong kdumpnic: $kdumpnic" && return 1
HOST_IP=$_host
fi
diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh
index 2a16900..c305d8e 100755
--- a/dracut-module-setup.sh
+++ b/dracut-module-setup.sh
@@ -71,10 +71,20 @@ kdump_setup_dns() {
#if it use static ip echo it, or echo null
kdump_static_ip() {
. /etc/sysconfig/network-scripts/ifcfg-$1
- if [ -n "$IPADDR" ]; then
- [ -z "$NETMASK" -a -n "$PREFIX" ] && \
- NETMASK=$(ipcalc -m $IPADDR/$PREFIX | cut -d'=' -f2)
- echo -n "${IPADDR}::${GATEWAY}:${NETMASK}::"
+ if is_ipv6_target
+ then
+ if [ -n "$IPV6ADDR" ]; then
+ IPV6ADDR=${IPV6ADDR%/*} #strip the prefix
+ IPV6ADDR="[${IPV6ADDR}]"
+ IPV6_DEFAULTGW="[${IPV6_DEFAULTGW}]"
+ echo -n "${IPV6ADDR}::${IPV6_DEFAULTGW}:64::"
+ fi
+ else
+ if [ -n "$IPADDR" ]; then
+ [ -z "$NETMASK" -a -n "$PREFIX" ] && \
+ NETMASK=$(ipcalc -m $IPADDR/$PREFIX | cut -d'=' -f2)
+ echo -n "${IPADDR}::${GATEWAY}:${NETMASK}::"
+ fi
fi
}
@@ -227,16 +237,24 @@ kdump_install_net() {
local _server _netdev
local config_val="$1"
- _server=`echo $config_val | sed 's/.*@//' | cut -d':' -f1`
+ _server=`echo $config_val | sed 's/.*@//'`
+ _server=${_server%:/*}
+ _server=${_server#[}
+ _server=${_server%]}
+ _server=${_server%\%*} #strip the zone_ID if exist
- _need_dns=`echo $_server|grep "[a-zA-Z]"`
- [ -n "$_need_dns" ] && _server=`getent hosts $_server|cut -d' ' -f1`
+ #ipv4 address or hostname
+ if ! is_ipv6_target
+ then
+ _need_dns=`echo $_server|grep "[a-zA-Z]"`
+ [ -n "$_need_dns" ] && _server=`getent hosts $_server|cut -d' ' -f1`
+ fi
_netdev=`/sbin/ip route get to $_server 2>&1`
[ $? != 0 ] && echo "Bad kdump location: $config_val" && exit 1
#the field in the ip output changes if we go to another subnet
- if [ -n "`echo $_netdev | grep via`" ]
+ if [ -n "`echo $_netdev | grep -E 'via|from'`" ]
then
# we are going to a different subnet
_netdev=`echo $_netdev|awk '{print $5;}'|head -n 1`
diff --git a/kdump-lib.sh b/kdump-lib.sh
index a20c6e8..332328f 100755
--- a/kdump-lib.sh
+++ b/kdump-lib.sh
@@ -44,6 +44,23 @@ strip_comments()
echo $@ | sed -e 's/\(.*\)#.*/\1/'
}
+# check the remote server ip address tpye
+is_ipv6_target()
+{
+ local _server
+ if is_ssh_dump_target; then
+ _server=`grep "^ssh" /etc/kdump.conf`
+ elif is_nfs_dump_target; then
+ _server=`grep "^nfs" /etc/kdump.conf`
+ fi
+
+ [ -z "$_server" ] && return 1
+ _server=`strip_comment $_server`
+ _server=${_server#*@}
+ _server=${_server%:/*}
+ echo $_server | grep -q ":"
+}
+
# Check if fence kdump is configured in Pacemaker cluster
is_pcs_fence_kdump()
{
--
1.8.4.2
9 years
[PATCH v2] kdump-module-setup.sh: Handle static IPs defined in NetworkManager gui
by Marc Milgram
NetworkManager changed the format of ifcfg-device files. They may define
static IP addresses with the following format:
IPADDR0=192.168.122.100
PREFIX0=24
There may be up to 255 ip addresses for a network device - each with a unique
number tagged to the end of IPADDR and PREFIX.
Prior to this fix, kdump only handled static ip addresses defined with
IPADDR=192.168.122.100
PREFIX=24
ie. without the number.
The solution is to use "ip" commands to find the correct network information.
Tested with both static and dynamic IP addresses.
v2: Fixed a local variable that was set incorrectly
Signed-off-by: Marc Milgram <mmilgram(a)redhat.com>
diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh
index 2a16900..bfe1924 100755
--- a/dracut-module-setup.sh
+++ b/dracut-module-setup.sh
@@ -67,14 +67,17 @@ kdump_setup_dns() {
}
#$1: netdev name
-#checking /etc/sysconfig/network-scripts/ifcfg-$1,
+#$2: srcaddr
#if it use static ip echo it, or echo null
kdump_static_ip() {
- . /etc/sysconfig/network-scripts/ifcfg-$1
- if [ -n "$IPADDR" ]; then
- [ -z "$NETMASK" -a -n "$PREFIX" ] && \
- NETMASK=$(ipcalc -m $IPADDR/$PREFIX | cut -d'=' -f2)
- echo -n "${IPADDR}::${GATEWAY}:${NETMASK}::"
+ local _netmask _gateway
+ local _netdev="$1" _srcaddr="$2"
+ local _ipaddr=$(ip addr show dev $_netdev permanent | \
+ awk "/ $_srcaddr\/.* $_netdev\$/{print \$2}")
+ if [ -n "$_ipaddr" ]; then
+ _netmask=$(ipcalc -m $_ipaddr | cut -d'=' -f2)
+ _gateway=$(ip route list dev $_netdev | awk '/^default /{print $3}')
+ echo -n "${_srcaddr}::${_gateway}:${_netmask}::"
fi
}
@@ -181,7 +184,7 @@ kdump_setup_znet() {
# Setup dracut to bringup a given network interface
kdump_setup_netdev() {
- local _netdev=$1
+ local _netdev=$1 _srcaddr=$2
local _static _proto _ip_conf _ip_opts _ifname_opts
if [ "$(uname -m)" = "s390x" ]; then
@@ -189,7 +192,7 @@ kdump_setup_netdev() {
fi
_netmac=$(kdump_get_mac_addr $_netdev)
- _static=$(kdump_static_ip $_netdev)
+ _static=$(kdump_static_ip $_netdev $_srcaddr)
if [ -n "$_static" ]; then
_proto=none
else
@@ -223,8 +226,9 @@ kdump_setup_netdev() {
#Function:kdump_install_net
#$1: config values of net line in kdump.conf
+#$2: srcaddr of network device
kdump_install_net() {
- local _server _netdev
+ local _server _netdev _srcaddr
local config_val="$1"
_server=`echo $config_val | sed 's/.*@//' | cut -d':' -f1`
@@ -239,13 +243,15 @@ kdump_install_net() {
if [ -n "`echo $_netdev | grep via`" ]
then
# we are going to a different subnet
+ _srcaddr=`echo $_netdev|awk '{print $7}'|head -n 1`
_netdev=`echo $_netdev|awk '{print $5;}'|head -n 1`
else
# we are on the same subnet
+ _srcaddr=`echo $_netdev|awk '{print $5}'|head -n 1`
_netdev=`echo $_netdev|awk '{print $3}'|head -n 1`
fi
- kdump_setup_netdev "${_netdev}"
+ kdump_setup_netdev "${_netdev}" "${_srcaddr}"
#save netdev used for kdump as cmdline
# Whoever calling kdump_install_net() is setting up the default gateway,
9 years
[PATCH] Modify dracut-kdump.sh and dracut-module-setup.sh to support ipv6 nfs dump
by Arthur Zou
Resolves: bz821620
Currently dracut has supported for ipv6, and it is a significant feture for
kdump to enhance to support ipv6.
For ipv6 nfs dump:
if ipv6 address type is link scope, /etc/kdump.conf should be edited like
"mount [fe80::5054:ff:fe48:ca80%eth0]:/mnt /mnt"
else /etc/kdump.conf should be edited like "mount [2001:db8:0:f101::2]:/mnt /mnt"
For ipv6 ssh dump
if ipv6 address type is link scope, /etc/kdump.conf should be edited like
"ssh root@fe80::5054:ff:fe48:ca80%eth0"
else /etc/kdump.conf should be edited like "ssh root@2001:db8:0:f101::2"
Signed-off-by: Arthur Zou <zzou(a)redhat.com>
---
dracut-kdump.sh | 5 +++--
dracut-module-setup.sh | 37 +++++++++++++++++++++++++++++--------
2 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/dracut-kdump.sh b/dracut-kdump.sh
index cb13d92..12a1c8c 100755
--- a/dracut-kdump.sh
+++ b/dracut-kdump.sh
@@ -206,10 +206,11 @@ get_host_ip()
then
kdumpnic=$(getarg kdumpnic=)
[ -z "$kdumpnic" ] && echo "kdump: failed to get kdumpnic!" && return 1
- _host=`ip addr show dev $kdumpnic|grep 'inet '`
+ _host=`ip addr show dev $kdumpnic|grep 'inet'`
[ $? -ne 0 ] && echo "kdump: wrong kdumpnic: $kdumpnic" && return 1
- _host="${_host##*inet }"
+ _host="${_host#*inet}"
_host="${_host%%/*}"
+ _host=`echo $_host | cut -d' ' -f2`
[ -z "$_host" ] && echo "kdump: wrong kdumpnic: $kdumpnic" && return 1
HOST_IP=$_host
fi
diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh
index 2a16900..20bdb38 100755
--- a/dracut-module-setup.sh
+++ b/dracut-module-setup.sh
@@ -71,11 +71,22 @@ kdump_setup_dns() {
#if it use static ip echo it, or echo null
kdump_static_ip() {
. /etc/sysconfig/network-scripts/ifcfg-$1
- if [ -n "$IPADDR" ]; then
- [ -z "$NETMASK" -a -n "$PREFIX" ] && \
- NETMASK=$(ipcalc -m $IPADDR/$PREFIX | cut -d'=' -f2)
- echo -n "${IPADDR}::${GATEWAY}:${NETMASK}::"
+ if [ -z "$ipv6" ]
+ then
+ if [ -n "$IPADDR" ]; then
+ [ -z "$NETMASK" -a -n "$PREFIX" ] && \
+ NETMASK=$(ipcalc -m $IPADDR/$PREFIX | cut -d'=' -f2)
+ echo -n "${IPADDR}::${GATEWAY}:${NETMASK}::"
+ fi
+ else
+ if [ -n "$IPV6ADDR" ]; then
+ IPV6ADDR=${IPV6ADDR%/*} #strip the prefix
+ IPV6ADDR="[${IPV6ADDR}]"
+ IPV6_DEFAULTGW="[${IPV6_DEFAULTGW}]"
+ echo -n "${IPV6ADDR}::${IPV6_DEFAULTGW}:64::"
+ fi
fi
+ unset ipv6
}
kdump_get_mac_addr() {
@@ -227,16 +238,26 @@ kdump_install_net() {
local _server _netdev
local config_val="$1"
- _server=`echo $config_val | sed 's/.*@//' | cut -d':' -f1`
+ _server=`echo $config_val | sed 's/.*@//'`
+ _server=${_server%:/*}
+ _server=${_server#[}
+ _server=${_server%]}
+ _server=${_server%\%*} #strip the zone_ID if exist
+
+ ipv6=`echo $_server | grep ":"`
- _need_dns=`echo $_server|grep "[a-zA-Z]"`
- [ -n "$_need_dns" ] && _server=`getent hosts $_server|cut -d' ' -f1`
+ #ipv4 address or hostname
+ if [ -z "$ipv6" ]
+ then
+ _need_dns=`echo $_server|grep "[a-zA-Z]"`
+ [ -n "$_need_dns" ] && _server=`getent hosts $_server|cut -d' ' -f1`
+ fi
_netdev=`/sbin/ip route get to $_server 2>&1`
[ $? != 0 ] && echo "Bad kdump location: $config_val" && exit 1
#the field in the ip output changes if we go to another subnet
- if [ -n "`echo $_netdev | grep via`" ]
+ if [ -n "`echo $_netdev | grep -E 'via|from'`" ]
then
# we are going to a different subnet
_netdev=`echo $_netdev|awk '{print $5;}'|head -n 1`
--
1.8.4.2
9 years
[PATCH REPOST 0/5] Kdump error handling service
by WANG Chao
Hi, All
This patchset introduce a new kdump emergency service. It will override the
existing emergency.service. When fatal error occurs, this emergency service
will be triggered and systemd will isolate to emergency path.
This kdump emergency service can will read kdump.conf and act according to the
configired "default action" (reboot/poweroff/halt/shell/dump_to_rootfs).
Along with this patchset, kdump-capture.service is introduced as a service unit
to run kdump.sh. When kdump-capture.service fails, systemd will isolate to
kdump emergency service. I copied all the dependencies from
dracut-pre-pivot.service to kdump-capture.service so that kdump.sh will be
called the correct time window.
WANG Chao (5):
mkdumprd: changes for mount point and options in 2nd kernel
cleanup: extract functions from kdump.sh to kdump-lib.sh
Introduce kdump error handling service
Introduce kdump capture service
disable dracut-emergency.service the whole time
dracut-kdump-capture.service | 32 ++++++++
dracut-kdump-emergency.service | 32 ++++++++
dracut-kdump-error-handler.sh | 10 +++
dracut-kdump.sh | 161 +---------------------------------------
dracut-module-setup.sh | 7 +-
kdump-lib.sh | 163 +++++++++++++++++++++++++++++++++++++++++
kexec-tools.spec | 7 +-
mkdumprd | 25 ++++---
8 files changed, 266 insertions(+), 171 deletions(-)
create mode 100644 dracut-kdump-capture.service
create mode 100644 dracut-kdump-emergency.service
create mode 100755 dracut-kdump-error-handler.sh
--
1.9.0
9 years
[PATCH] Rename the subpackage kdump-anaconda-addon
by Arthur Zou
Rename the subpackage kdump-anaconda-addon to kexec-tools-anaconda-addon
to keep consistency and make fedpkg build happy
Because every time fedpkg builds a new release the package version number
should increase. But kdump-annaconda-addon just keep same version, so let's
rename it to kexec-tools-annaconda-addon here kexec-tools- is a default prefix.
For version let's use default top level version.
At the same time, rename the kdump-anaconda-addon directory name to anaconda-addon
to make it more standard. Using the current data instead of version number as a
surfix of kdump-anaconda-addon tarball just like kexec-tools-po did.
Signed-off-by: Arthur Zou <zzou(a)redhat.com>
---
{kdump-anaconda-addon => anaconda-addon}/Makefile | 18 ++++++++----------
{kdump-anaconda-addon => anaconda-addon}/README | 0
.../com_redhat_kdump/__init__.py | 0
.../com_redhat_kdump/common.py | 0
.../com_redhat_kdump/constants.py | 0
.../com_redhat_kdump/gui/__init__.py | 0
.../com_redhat_kdump/gui/spokes/RHEL.glade | 0
.../com_redhat_kdump/gui/spokes/__init__.py | 0
.../com_redhat_kdump/gui/spokes/fedora.glade | 0
.../com_redhat_kdump/gui/spokes/kdump.py | 0
.../com_redhat_kdump/i18n.py | 0
.../com_redhat_kdump/ks/__init__.py | 0
.../com_redhat_kdump/ks/kdump.py | 0
.../com_redhat_kdump/tui/__init__.py | 0
.../com_redhat_kdump/tui/spokes/__init__.py | 0
.../com_redhat_kdump/tui/spokes/kdump.py | 0
{kdump-anaconda-addon => anaconda-addon}/po/Makefile | 0
{kdump-anaconda-addon => anaconda-addon}/po/ar.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/as.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/bg.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/bn.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/bn_IN.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/bs.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/ca.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/cs.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/cy.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/da.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/de.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/el.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/en_GB.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/es.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/et.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/fa.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/fi.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/fr.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/gu.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/he.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/hi.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/hr.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/hu.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/hy.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/id.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/is.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/it.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/ja.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/ka.po | 0
.../po/kdump-anaconda-addon.pot | 0
{kdump-anaconda-addon => anaconda-addon}/po/kn.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/ko.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/ku.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/lo.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/lv.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/mk.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/ml.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/mr.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/ms.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/my.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/nb.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/nl.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/or.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/pa.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/pl.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/pom.xml | 0
{kdump-anaconda-addon => anaconda-addon}/po/pt.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/pt_BR.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/ru.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/si.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/sk.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/sl.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/sq.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/sr.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/sr(a)Latn.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/sv.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/ta.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/ta_IN.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/te.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/tr.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/uk.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/ur.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/vi.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/zanata.xml | 0
{kdump-anaconda-addon => anaconda-addon}/po/zh_CN.po | 0
{kdump-anaconda-addon => anaconda-addon}/po/zh_TW.po | 0
kexec-tools.spec | 14 ++++++--------
84 files changed, 14 insertions(+), 18 deletions(-)
rename {kdump-anaconda-addon => anaconda-addon}/Makefile (84%)
rename {kdump-anaconda-addon => anaconda-addon}/README (100%)
rename {kdump-anaconda-addon => anaconda-addon}/com_redhat_kdump/__init__.py (100%)
rename {kdump-anaconda-addon => anaconda-addon}/com_redhat_kdump/common.py (100%)
rename {kdump-anaconda-addon => anaconda-addon}/com_redhat_kdump/constants.py (100%)
rename {kdump-anaconda-addon => anaconda-addon}/com_redhat_kdump/gui/__init__.py (100%)
rename {kdump-anaconda-addon => anaconda-addon}/com_redhat_kdump/gui/spokes/RHEL.glade (100%)
rename {kdump-anaconda-addon => anaconda-addon}/com_redhat_kdump/gui/spokes/__init__.py (100%)
rename {kdump-anaconda-addon => anaconda-addon}/com_redhat_kdump/gui/spokes/fedora.glade (100%)
rename {kdump-anaconda-addon => anaconda-addon}/com_redhat_kdump/gui/spokes/kdump.py (100%)
rename {kdump-anaconda-addon => anaconda-addon}/com_redhat_kdump/i18n.py (100%)
rename {kdump-anaconda-addon => anaconda-addon}/com_redhat_kdump/ks/__init__.py (100%)
rename {kdump-anaconda-addon => anaconda-addon}/com_redhat_kdump/ks/kdump.py (100%)
rename {kdump-anaconda-addon => anaconda-addon}/com_redhat_kdump/tui/__init__.py (100%)
rename {kdump-anaconda-addon => anaconda-addon}/com_redhat_kdump/tui/spokes/__init__.py (100%)
rename {kdump-anaconda-addon => anaconda-addon}/com_redhat_kdump/tui/spokes/kdump.py (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/Makefile (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/ar.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/as.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/bg.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/bn.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/bn_IN.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/bs.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/ca.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/cs.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/cy.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/da.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/de.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/el.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/en_GB.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/es.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/et.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/fa.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/fi.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/fr.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/gu.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/he.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/hi.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/hr.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/hu.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/hy.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/id.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/is.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/it.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/ja.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/ka.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/kdump-anaconda-addon.pot (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/kn.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/ko.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/ku.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/lo.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/lv.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/mk.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/ml.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/mr.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/ms.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/my.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/nb.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/nl.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/or.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/pa.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/pl.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/pom.xml (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/pt.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/pt_BR.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/ru.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/si.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/sk.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/sl.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/sq.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/sr.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/sr(a)Latn.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/sv.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/ta.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/ta_IN.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/te.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/tr.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/uk.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/ur.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/vi.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/zanata.xml (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/zh_CN.po (100%)
rename {kdump-anaconda-addon => anaconda-addon}/po/zh_TW.po (100%)
diff --git a/kdump-anaconda-addon/Makefile b/anaconda-addon/Makefile
similarity index 84%
rename from kdump-anaconda-addon/Makefile
rename to anaconda-addon/Makefile
index affd8f5..1b30e44 100644
--- a/kdump-anaconda-addon/Makefile
+++ b/anaconda-addon/Makefile
@@ -1,7 +1,5 @@
NAME = kdump-anaconda-addon
-VERSION = 0.1
-
ADDON = com_redhat_kdump
TESTS = test
@@ -20,7 +18,7 @@ all:
@echo " make install"
@echo " make uninstall"
-DISTNAME = $(NAME)-$(VERSION)
+DISTNAME = $(NAME)-$(shell date +%Y%m%d)
ADDONDIR = /usr/share/anaconda/addons/
DISTBALL = $(DISTNAME).tar.gz
NUM_PROCS = $$(getconf _NPROCESSORS_ONLN)
@@ -34,28 +32,28 @@ uninstall:
rm -rfv $(DESTDIR)$(ADDONDIR)
dist:
- rm -rf $(DISTNAME)
- mkdir -p $(DISTNAME)
+ rm -rf $(NAME)
+ mkdir -p $(NAME)
@if test -d ".git"; \
then \
echo Creating ChangeLog && \
( cd "$(top_srcdir)" && \
echo '# Generate automatically. Do not edit.'; echo; \
git log --stat --date=short ) > ChangeLog.tmp \
- && mv -f ChangeLog.tmp $(DISTNAME)/ChangeLog \
+ && mv -f ChangeLog.tmp $(NAME)/ChangeLog \
|| ( rm -f ChangeLog.tmp ; \
echo Failed to generate ChangeLog >&2 ); \
else \
echo A git clone is required to generate a ChangeLog >&2; \
fi
for file in $(FILES); do \
- cp -rpv $$file $(DISTNAME)/$$file; \
+ cp -rpv $$file $(NAME)/$$file; \
done
for excl in $(EXCLUDES); do \
- find $(DISTNAME) -name "$$excl" -delete; \
+ find $(NAME) -name "$$excl" -delete; \
done
- tar -czvf ../$(DISTBALL) $(DISTNAME)
- rm -rf $(DISTNAME)
+ tar -czvf ../$(DISTBALL) $(NAME)
+ rm -rf $(NAME)
potfile:
$(MAKE) DESTDIR=$(DESTDIR) -C po potfile
diff --git a/kdump-anaconda-addon/README b/anaconda-addon/README
similarity index 100%
rename from kdump-anaconda-addon/README
rename to anaconda-addon/README
diff --git a/kdump-anaconda-addon/com_redhat_kdump/__init__.py b/anaconda-addon/com_redhat_kdump/__init__.py
similarity index 100%
rename from kdump-anaconda-addon/com_redhat_kdump/__init__.py
rename to anaconda-addon/com_redhat_kdump/__init__.py
diff --git a/kdump-anaconda-addon/com_redhat_kdump/common.py b/anaconda-addon/com_redhat_kdump/common.py
similarity index 100%
rename from kdump-anaconda-addon/com_redhat_kdump/common.py
rename to anaconda-addon/com_redhat_kdump/common.py
diff --git a/kdump-anaconda-addon/com_redhat_kdump/constants.py b/anaconda-addon/com_redhat_kdump/constants.py
similarity index 100%
rename from kdump-anaconda-addon/com_redhat_kdump/constants.py
rename to anaconda-addon/com_redhat_kdump/constants.py
diff --git a/kdump-anaconda-addon/com_redhat_kdump/gui/__init__.py b/anaconda-addon/com_redhat_kdump/gui/__init__.py
similarity index 100%
rename from kdump-anaconda-addon/com_redhat_kdump/gui/__init__.py
rename to anaconda-addon/com_redhat_kdump/gui/__init__.py
diff --git a/kdump-anaconda-addon/com_redhat_kdump/gui/spokes/RHEL.glade b/anaconda-addon/com_redhat_kdump/gui/spokes/RHEL.glade
similarity index 100%
rename from kdump-anaconda-addon/com_redhat_kdump/gui/spokes/RHEL.glade
rename to anaconda-addon/com_redhat_kdump/gui/spokes/RHEL.glade
diff --git a/kdump-anaconda-addon/com_redhat_kdump/gui/spokes/__init__.py b/anaconda-addon/com_redhat_kdump/gui/spokes/__init__.py
similarity index 100%
rename from kdump-anaconda-addon/com_redhat_kdump/gui/spokes/__init__.py
rename to anaconda-addon/com_redhat_kdump/gui/spokes/__init__.py
diff --git a/kdump-anaconda-addon/com_redhat_kdump/gui/spokes/fedora.glade b/anaconda-addon/com_redhat_kdump/gui/spokes/fedora.glade
similarity index 100%
rename from kdump-anaconda-addon/com_redhat_kdump/gui/spokes/fedora.glade
rename to anaconda-addon/com_redhat_kdump/gui/spokes/fedora.glade
diff --git a/kdump-anaconda-addon/com_redhat_kdump/gui/spokes/kdump.py b/anaconda-addon/com_redhat_kdump/gui/spokes/kdump.py
similarity index 100%
rename from kdump-anaconda-addon/com_redhat_kdump/gui/spokes/kdump.py
rename to anaconda-addon/com_redhat_kdump/gui/spokes/kdump.py
diff --git a/kdump-anaconda-addon/com_redhat_kdump/i18n.py b/anaconda-addon/com_redhat_kdump/i18n.py
similarity index 100%
rename from kdump-anaconda-addon/com_redhat_kdump/i18n.py
rename to anaconda-addon/com_redhat_kdump/i18n.py
diff --git a/kdump-anaconda-addon/com_redhat_kdump/ks/__init__.py b/anaconda-addon/com_redhat_kdump/ks/__init__.py
similarity index 100%
rename from kdump-anaconda-addon/com_redhat_kdump/ks/__init__.py
rename to anaconda-addon/com_redhat_kdump/ks/__init__.py
diff --git a/kdump-anaconda-addon/com_redhat_kdump/ks/kdump.py b/anaconda-addon/com_redhat_kdump/ks/kdump.py
similarity index 100%
rename from kdump-anaconda-addon/com_redhat_kdump/ks/kdump.py
rename to anaconda-addon/com_redhat_kdump/ks/kdump.py
diff --git a/kdump-anaconda-addon/com_redhat_kdump/tui/__init__.py b/anaconda-addon/com_redhat_kdump/tui/__init__.py
similarity index 100%
rename from kdump-anaconda-addon/com_redhat_kdump/tui/__init__.py
rename to anaconda-addon/com_redhat_kdump/tui/__init__.py
diff --git a/kdump-anaconda-addon/com_redhat_kdump/tui/spokes/__init__.py b/anaconda-addon/com_redhat_kdump/tui/spokes/__init__.py
similarity index 100%
rename from kdump-anaconda-addon/com_redhat_kdump/tui/spokes/__init__.py
rename to anaconda-addon/com_redhat_kdump/tui/spokes/__init__.py
diff --git a/kdump-anaconda-addon/com_redhat_kdump/tui/spokes/kdump.py b/anaconda-addon/com_redhat_kdump/tui/spokes/kdump.py
similarity index 100%
rename from kdump-anaconda-addon/com_redhat_kdump/tui/spokes/kdump.py
rename to anaconda-addon/com_redhat_kdump/tui/spokes/kdump.py
diff --git a/kdump-anaconda-addon/po/Makefile b/anaconda-addon/po/Makefile
similarity index 100%
rename from kdump-anaconda-addon/po/Makefile
rename to anaconda-addon/po/Makefile
diff --git a/kdump-anaconda-addon/po/ar.po b/anaconda-addon/po/ar.po
similarity index 100%
rename from kdump-anaconda-addon/po/ar.po
rename to anaconda-addon/po/ar.po
diff --git a/kdump-anaconda-addon/po/as.po b/anaconda-addon/po/as.po
similarity index 100%
rename from kdump-anaconda-addon/po/as.po
rename to anaconda-addon/po/as.po
diff --git a/kdump-anaconda-addon/po/bg.po b/anaconda-addon/po/bg.po
similarity index 100%
rename from kdump-anaconda-addon/po/bg.po
rename to anaconda-addon/po/bg.po
diff --git a/kdump-anaconda-addon/po/bn.po b/anaconda-addon/po/bn.po
similarity index 100%
rename from kdump-anaconda-addon/po/bn.po
rename to anaconda-addon/po/bn.po
diff --git a/kdump-anaconda-addon/po/bn_IN.po b/anaconda-addon/po/bn_IN.po
similarity index 100%
rename from kdump-anaconda-addon/po/bn_IN.po
rename to anaconda-addon/po/bn_IN.po
diff --git a/kdump-anaconda-addon/po/bs.po b/anaconda-addon/po/bs.po
similarity index 100%
rename from kdump-anaconda-addon/po/bs.po
rename to anaconda-addon/po/bs.po
diff --git a/kdump-anaconda-addon/po/ca.po b/anaconda-addon/po/ca.po
similarity index 100%
rename from kdump-anaconda-addon/po/ca.po
rename to anaconda-addon/po/ca.po
diff --git a/kdump-anaconda-addon/po/cs.po b/anaconda-addon/po/cs.po
similarity index 100%
rename from kdump-anaconda-addon/po/cs.po
rename to anaconda-addon/po/cs.po
diff --git a/kdump-anaconda-addon/po/cy.po b/anaconda-addon/po/cy.po
similarity index 100%
rename from kdump-anaconda-addon/po/cy.po
rename to anaconda-addon/po/cy.po
diff --git a/kdump-anaconda-addon/po/da.po b/anaconda-addon/po/da.po
similarity index 100%
rename from kdump-anaconda-addon/po/da.po
rename to anaconda-addon/po/da.po
diff --git a/kdump-anaconda-addon/po/de.po b/anaconda-addon/po/de.po
similarity index 100%
rename from kdump-anaconda-addon/po/de.po
rename to anaconda-addon/po/de.po
diff --git a/kdump-anaconda-addon/po/el.po b/anaconda-addon/po/el.po
similarity index 100%
rename from kdump-anaconda-addon/po/el.po
rename to anaconda-addon/po/el.po
diff --git a/kdump-anaconda-addon/po/en_GB.po b/anaconda-addon/po/en_GB.po
similarity index 100%
rename from kdump-anaconda-addon/po/en_GB.po
rename to anaconda-addon/po/en_GB.po
diff --git a/kdump-anaconda-addon/po/es.po b/anaconda-addon/po/es.po
similarity index 100%
rename from kdump-anaconda-addon/po/es.po
rename to anaconda-addon/po/es.po
diff --git a/kdump-anaconda-addon/po/et.po b/anaconda-addon/po/et.po
similarity index 100%
rename from kdump-anaconda-addon/po/et.po
rename to anaconda-addon/po/et.po
diff --git a/kdump-anaconda-addon/po/fa.po b/anaconda-addon/po/fa.po
similarity index 100%
rename from kdump-anaconda-addon/po/fa.po
rename to anaconda-addon/po/fa.po
diff --git a/kdump-anaconda-addon/po/fi.po b/anaconda-addon/po/fi.po
similarity index 100%
rename from kdump-anaconda-addon/po/fi.po
rename to anaconda-addon/po/fi.po
diff --git a/kdump-anaconda-addon/po/fr.po b/anaconda-addon/po/fr.po
similarity index 100%
rename from kdump-anaconda-addon/po/fr.po
rename to anaconda-addon/po/fr.po
diff --git a/kdump-anaconda-addon/po/gu.po b/anaconda-addon/po/gu.po
similarity index 100%
rename from kdump-anaconda-addon/po/gu.po
rename to anaconda-addon/po/gu.po
diff --git a/kdump-anaconda-addon/po/he.po b/anaconda-addon/po/he.po
similarity index 100%
rename from kdump-anaconda-addon/po/he.po
rename to anaconda-addon/po/he.po
diff --git a/kdump-anaconda-addon/po/hi.po b/anaconda-addon/po/hi.po
similarity index 100%
rename from kdump-anaconda-addon/po/hi.po
rename to anaconda-addon/po/hi.po
diff --git a/kdump-anaconda-addon/po/hr.po b/anaconda-addon/po/hr.po
similarity index 100%
rename from kdump-anaconda-addon/po/hr.po
rename to anaconda-addon/po/hr.po
diff --git a/kdump-anaconda-addon/po/hu.po b/anaconda-addon/po/hu.po
similarity index 100%
rename from kdump-anaconda-addon/po/hu.po
rename to anaconda-addon/po/hu.po
diff --git a/kdump-anaconda-addon/po/hy.po b/anaconda-addon/po/hy.po
similarity index 100%
rename from kdump-anaconda-addon/po/hy.po
rename to anaconda-addon/po/hy.po
diff --git a/kdump-anaconda-addon/po/id.po b/anaconda-addon/po/id.po
similarity index 100%
rename from kdump-anaconda-addon/po/id.po
rename to anaconda-addon/po/id.po
diff --git a/kdump-anaconda-addon/po/is.po b/anaconda-addon/po/is.po
similarity index 100%
rename from kdump-anaconda-addon/po/is.po
rename to anaconda-addon/po/is.po
diff --git a/kdump-anaconda-addon/po/it.po b/anaconda-addon/po/it.po
similarity index 100%
rename from kdump-anaconda-addon/po/it.po
rename to anaconda-addon/po/it.po
diff --git a/kdump-anaconda-addon/po/ja.po b/anaconda-addon/po/ja.po
similarity index 100%
rename from kdump-anaconda-addon/po/ja.po
rename to anaconda-addon/po/ja.po
diff --git a/kdump-anaconda-addon/po/ka.po b/anaconda-addon/po/ka.po
similarity index 100%
rename from kdump-anaconda-addon/po/ka.po
rename to anaconda-addon/po/ka.po
diff --git a/kdump-anaconda-addon/po/kdump-anaconda-addon.pot b/anaconda-addon/po/kdump-anaconda-addon.pot
similarity index 100%
rename from kdump-anaconda-addon/po/kdump-anaconda-addon.pot
rename to anaconda-addon/po/kdump-anaconda-addon.pot
diff --git a/kdump-anaconda-addon/po/kn.po b/anaconda-addon/po/kn.po
similarity index 100%
rename from kdump-anaconda-addon/po/kn.po
rename to anaconda-addon/po/kn.po
diff --git a/kdump-anaconda-addon/po/ko.po b/anaconda-addon/po/ko.po
similarity index 100%
rename from kdump-anaconda-addon/po/ko.po
rename to anaconda-addon/po/ko.po
diff --git a/kdump-anaconda-addon/po/ku.po b/anaconda-addon/po/ku.po
similarity index 100%
rename from kdump-anaconda-addon/po/ku.po
rename to anaconda-addon/po/ku.po
diff --git a/kdump-anaconda-addon/po/lo.po b/anaconda-addon/po/lo.po
similarity index 100%
rename from kdump-anaconda-addon/po/lo.po
rename to anaconda-addon/po/lo.po
diff --git a/kdump-anaconda-addon/po/lv.po b/anaconda-addon/po/lv.po
similarity index 100%
rename from kdump-anaconda-addon/po/lv.po
rename to anaconda-addon/po/lv.po
diff --git a/kdump-anaconda-addon/po/mk.po b/anaconda-addon/po/mk.po
similarity index 100%
rename from kdump-anaconda-addon/po/mk.po
rename to anaconda-addon/po/mk.po
diff --git a/kdump-anaconda-addon/po/ml.po b/anaconda-addon/po/ml.po
similarity index 100%
rename from kdump-anaconda-addon/po/ml.po
rename to anaconda-addon/po/ml.po
diff --git a/kdump-anaconda-addon/po/mr.po b/anaconda-addon/po/mr.po
similarity index 100%
rename from kdump-anaconda-addon/po/mr.po
rename to anaconda-addon/po/mr.po
diff --git a/kdump-anaconda-addon/po/ms.po b/anaconda-addon/po/ms.po
similarity index 100%
rename from kdump-anaconda-addon/po/ms.po
rename to anaconda-addon/po/ms.po
diff --git a/kdump-anaconda-addon/po/my.po b/anaconda-addon/po/my.po
similarity index 100%
rename from kdump-anaconda-addon/po/my.po
rename to anaconda-addon/po/my.po
diff --git a/kdump-anaconda-addon/po/nb.po b/anaconda-addon/po/nb.po
similarity index 100%
rename from kdump-anaconda-addon/po/nb.po
rename to anaconda-addon/po/nb.po
diff --git a/kdump-anaconda-addon/po/nl.po b/anaconda-addon/po/nl.po
similarity index 100%
rename from kdump-anaconda-addon/po/nl.po
rename to anaconda-addon/po/nl.po
diff --git a/kdump-anaconda-addon/po/or.po b/anaconda-addon/po/or.po
similarity index 100%
rename from kdump-anaconda-addon/po/or.po
rename to anaconda-addon/po/or.po
diff --git a/kdump-anaconda-addon/po/pa.po b/anaconda-addon/po/pa.po
similarity index 100%
rename from kdump-anaconda-addon/po/pa.po
rename to anaconda-addon/po/pa.po
diff --git a/kdump-anaconda-addon/po/pl.po b/anaconda-addon/po/pl.po
similarity index 100%
rename from kdump-anaconda-addon/po/pl.po
rename to anaconda-addon/po/pl.po
diff --git a/kdump-anaconda-addon/po/pom.xml b/anaconda-addon/po/pom.xml
similarity index 100%
rename from kdump-anaconda-addon/po/pom.xml
rename to anaconda-addon/po/pom.xml
diff --git a/kdump-anaconda-addon/po/pt.po b/anaconda-addon/po/pt.po
similarity index 100%
rename from kdump-anaconda-addon/po/pt.po
rename to anaconda-addon/po/pt.po
diff --git a/kdump-anaconda-addon/po/pt_BR.po b/anaconda-addon/po/pt_BR.po
similarity index 100%
rename from kdump-anaconda-addon/po/pt_BR.po
rename to anaconda-addon/po/pt_BR.po
diff --git a/kdump-anaconda-addon/po/ru.po b/anaconda-addon/po/ru.po
similarity index 100%
rename from kdump-anaconda-addon/po/ru.po
rename to anaconda-addon/po/ru.po
diff --git a/kdump-anaconda-addon/po/si.po b/anaconda-addon/po/si.po
similarity index 100%
rename from kdump-anaconda-addon/po/si.po
rename to anaconda-addon/po/si.po
diff --git a/kdump-anaconda-addon/po/sk.po b/anaconda-addon/po/sk.po
similarity index 100%
rename from kdump-anaconda-addon/po/sk.po
rename to anaconda-addon/po/sk.po
diff --git a/kdump-anaconda-addon/po/sl.po b/anaconda-addon/po/sl.po
similarity index 100%
rename from kdump-anaconda-addon/po/sl.po
rename to anaconda-addon/po/sl.po
diff --git a/kdump-anaconda-addon/po/sq.po b/anaconda-addon/po/sq.po
similarity index 100%
rename from kdump-anaconda-addon/po/sq.po
rename to anaconda-addon/po/sq.po
diff --git a/kdump-anaconda-addon/po/sr.po b/anaconda-addon/po/sr.po
similarity index 100%
rename from kdump-anaconda-addon/po/sr.po
rename to anaconda-addon/po/sr.po
diff --git a/kdump-anaconda-addon/po/sr(a)Latn.po b/anaconda-addon/po/sr(a)Latn.po
similarity index 100%
rename from kdump-anaconda-addon/po/sr(a)Latn.po
rename to anaconda-addon/po/sr(a)Latn.po
diff --git a/kdump-anaconda-addon/po/sv.po b/anaconda-addon/po/sv.po
similarity index 100%
rename from kdump-anaconda-addon/po/sv.po
rename to anaconda-addon/po/sv.po
diff --git a/kdump-anaconda-addon/po/ta.po b/anaconda-addon/po/ta.po
similarity index 100%
rename from kdump-anaconda-addon/po/ta.po
rename to anaconda-addon/po/ta.po
diff --git a/kdump-anaconda-addon/po/ta_IN.po b/anaconda-addon/po/ta_IN.po
similarity index 100%
rename from kdump-anaconda-addon/po/ta_IN.po
rename to anaconda-addon/po/ta_IN.po
diff --git a/kdump-anaconda-addon/po/te.po b/anaconda-addon/po/te.po
similarity index 100%
rename from kdump-anaconda-addon/po/te.po
rename to anaconda-addon/po/te.po
diff --git a/kdump-anaconda-addon/po/tr.po b/anaconda-addon/po/tr.po
similarity index 100%
rename from kdump-anaconda-addon/po/tr.po
rename to anaconda-addon/po/tr.po
diff --git a/kdump-anaconda-addon/po/uk.po b/anaconda-addon/po/uk.po
similarity index 100%
rename from kdump-anaconda-addon/po/uk.po
rename to anaconda-addon/po/uk.po
diff --git a/kdump-anaconda-addon/po/ur.po b/anaconda-addon/po/ur.po
similarity index 100%
rename from kdump-anaconda-addon/po/ur.po
rename to anaconda-addon/po/ur.po
diff --git a/kdump-anaconda-addon/po/vi.po b/anaconda-addon/po/vi.po
similarity index 100%
rename from kdump-anaconda-addon/po/vi.po
rename to anaconda-addon/po/vi.po
diff --git a/kdump-anaconda-addon/po/zanata.xml b/anaconda-addon/po/zanata.xml
similarity index 100%
rename from kdump-anaconda-addon/po/zanata.xml
rename to anaconda-addon/po/zanata.xml
diff --git a/kdump-anaconda-addon/po/zh_CN.po b/anaconda-addon/po/zh_CN.po
similarity index 100%
rename from kdump-anaconda-addon/po/zh_CN.po
rename to anaconda-addon/po/zh_CN.po
diff --git a/kdump-anaconda-addon/po/zh_TW.po b/anaconda-addon/po/zh_TW.po
similarity index 100%
rename from kdump-anaconda-addon/po/zh_TW.po
rename to anaconda-addon/po/zh_TW.po
diff --git a/kexec-tools.spec b/kexec-tools.spec
index f810271..2b275f2 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -26,7 +26,7 @@ Source19: eppic_030413.tar.gz
Source20: kdump-lib.sh
Source21: kdump-in-cluster-environment.txt
Source22: kdump-dep-generator.sh
-Source23: kdump-anaconda-addon-0.1.tar.gz
+Source23: kdump-anaconda-addon-20140522.tar.gz
#######################################
# These are sources for mkdumpramfs
@@ -97,12 +97,10 @@ The eppic_makedumpfile.so shared object is loaded by the
or confidential kernel data from a dumpfile.
%endif
-%package -n kdump-anaconda-addon
-Version: 0.1
-Release: 1%{?dist}
+%package anaconda-addon
Summary: Kdump configration anaconda addon
Requires: anaconda >= 21.33
-%description -n kdump-anaconda-addon
+%description anaconda-addon
Kdump anaconda addon
%prep
@@ -143,7 +141,7 @@ make -C eppic/libeppic
make -C makedumpfile-1.5.6 LINKTYPE=dynamic USELZO=on USESNAPPY=on
%endif
make -C kexec-tools-po
-make -C kdump-anaconda-addon-0.1/po
+make -C kdump-anaconda-addon/po
%install
make install DESTDIR=$RPM_BUILD_ROOT
@@ -191,7 +189,7 @@ install -m 755 makedumpfile-1.5.6/eppic_makedumpfile.so $RPM_BUILD_ROOT/%{_libdi
%endif
make -C kexec-tools-po install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
-make -C kdump-anaconda-addon-0.1 install DESTDIR=$RPM_BUILD_ROOT
+make -C kdump-anaconda-addon install DESTDIR=$RPM_BUILD_ROOT
%find_lang kdump-anaconda-addon
%define remove_dracut_prefix() %(echo -n %1|sed 's/.*dracut-//g')
@@ -325,7 +323,7 @@ done
%{_libdir}/eppic_makedumpfile.so
%endif
-%files -n kdump-anaconda-addon -f kdump-anaconda-addon.lang
+%files anaconda-addon -f kdump-anaconda-addon.lang
%{_datadir}/anaconda/addons/com_redhat_kdump
%doc
--
1.8.4.2
9 years
[PATCH] Rename the subpackage kdump-anaconda-addon
by Arthur Zou
Rename the subpackage kdump-anaconda-addon to kexec-tool-anaconda-addon
to keep consistency
Signed-off-by: Arthur Zou <zzou(a)redhat.com>
---
kdump-anaconda-addon/Makefile | 14 +++++++-------
kexec-tools.spec | 12 +++++-------
2 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/kdump-anaconda-addon/Makefile b/kdump-anaconda-addon/Makefile
index affd8f5..7f8747d 100644
--- a/kdump-anaconda-addon/Makefile
+++ b/kdump-anaconda-addon/Makefile
@@ -34,28 +34,28 @@ uninstall:
rm -rfv $(DESTDIR)$(ADDONDIR)
dist:
- rm -rf $(DISTNAME)
- mkdir -p $(DISTNAME)
+ rm -rf $(NAME)
+ mkdir -p $(NAME)
@if test -d ".git"; \
then \
echo Creating ChangeLog && \
( cd "$(top_srcdir)" && \
echo '# Generate automatically. Do not edit.'; echo; \
git log --stat --date=short ) > ChangeLog.tmp \
- && mv -f ChangeLog.tmp $(DISTNAME)/ChangeLog \
+ && mv -f ChangeLog.tmp $(NAME)/ChangeLog \
|| ( rm -f ChangeLog.tmp ; \
echo Failed to generate ChangeLog >&2 ); \
else \
echo A git clone is required to generate a ChangeLog >&2; \
fi
for file in $(FILES); do \
- cp -rpv $$file $(DISTNAME)/$$file; \
+ cp -rpv $$file $(NAME)/$$file; \
done
for excl in $(EXCLUDES); do \
- find $(DISTNAME) -name "$$excl" -delete; \
+ find $(NAME) -name "$$excl" -delete; \
done
- tar -czvf ../$(DISTBALL) $(DISTNAME)
- rm -rf $(DISTNAME)
+ tar -czvf ../$(DISTBALL) $(NAME)
+ rm -rf $(NAME)
potfile:
$(MAKE) DESTDIR=$(DESTDIR) -C po potfile
diff --git a/kexec-tools.spec b/kexec-tools.spec
index f810271..afe5aa9 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -97,12 +97,10 @@ The eppic_makedumpfile.so shared object is loaded by the
or confidential kernel data from a dumpfile.
%endif
-%package -n kdump-anaconda-addon
-Version: 0.1
-Release: 1%{?dist}
+%package anaconda-addon
Summary: Kdump configration anaconda addon
Requires: anaconda >= 21.33
-%description -n kdump-anaconda-addon
+%description anaconda-addon
Kdump anaconda addon
%prep
@@ -143,7 +141,7 @@ make -C eppic/libeppic
make -C makedumpfile-1.5.6 LINKTYPE=dynamic USELZO=on USESNAPPY=on
%endif
make -C kexec-tools-po
-make -C kdump-anaconda-addon-0.1/po
+make -C kdump-anaconda-addon/po
%install
make install DESTDIR=$RPM_BUILD_ROOT
@@ -191,7 +189,7 @@ install -m 755 makedumpfile-1.5.6/eppic_makedumpfile.so $RPM_BUILD_ROOT/%{_libdi
%endif
make -C kexec-tools-po install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
-make -C kdump-anaconda-addon-0.1 install DESTDIR=$RPM_BUILD_ROOT
+make -C kdump-anaconda-addon install DESTDIR=$RPM_BUILD_ROOT
%find_lang kdump-anaconda-addon
%define remove_dracut_prefix() %(echo -n %1|sed 's/.*dracut-//g')
@@ -325,7 +323,7 @@ done
%{_libdir}/eppic_makedumpfile.so
%endif
-%files -n kdump-anaconda-addon -f kdump-anaconda-addon.lang
+%files anaconda-addon -f kdump-anaconda-addon.lang
%{_datadir}/anaconda/addons/com_redhat_kdump
%doc
--
1.8.4.2
9 years
